From 3407b0021f345fc2e12e2e1d54725a7e7e62299f Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 11:27:07 +0000 Subject: [PATCH 01/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'ngrpmx'=20to=20'?= =?UTF-8?q?n=5Fpf=5Fgroups=5Fmax'=20across=20multiple=20files=20for=20cons?= =?UTF-8?q?istency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 42 +++++++++++++++------------- process/utilities/errorlist.json | 2 +- source/fortran/input.f90 | 16 +++++------ source/fortran/pfcoil.f90 | 6 ++-- source/fortran/pfcoil_variables.f90 | 16 +++++------ tests/integration/ref_dicts.json | 8 +++--- tests/integration/test_pfcoil_int.py | 20 +++++++++---- 7 files changed, 61 insertions(+), 49 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index a15ac3553a..74bf135739 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -67,15 +67,15 @@ def pfcoil(self): Central Solenoid coils, to determine their size, location, current waveforms, stresses etc. """ - lrow1 = 2 * pfv.nptsmx + pfv.ngrpmx - lcol1 = pfv.ngrpmx + lrow1 = 2 * pfv.nptsmx + pfv.n_pf_groups_max + lcol1 = pfv.n_pf_groups_max - pcls0 = np.zeros(pfv.ngrpmx, dtype=int) - ncls0 = np.zeros(pfv.ngrpmx + 2, dtype=int) + pcls0 = np.zeros(pfv.n_pf_groups_max, dtype=int) + ncls0 = np.zeros(pfv.n_pf_groups_max + 2, dtype=int) - pf.rcls0, pf.zcls0 = np.zeros((2, pfv.ngrpmx, pfv.nclsmx), order="F") - pf.ccls0 = np.zeros(int(pfv.ngrpmx / 2)) - sigma, work2 = np.zeros((2, pfv.ngrpmx)) + pf.rcls0, pf.zcls0 = np.zeros((2, pfv.n_pf_groups_max, pfv.nclsmx), order="F") + pf.ccls0 = np.zeros(int(pfv.n_pf_groups_max / 2)) + sigma, work2 = np.zeros((2, pfv.n_pf_groups_max)) rc, zc, cc, xc = np.zeros((4, pfv.nclsmx)) brin, bzin, rpts, zpts = np.zeros((4, pfv.nptsmx)) bfix, bvec = np.zeros((2, lrow1)) @@ -88,9 +88,9 @@ def pfcoil(self): # Set up the number of PF coils including the Central Solenoid (nohc), # and the number of PF circuits including the plasma (ncirt) - if pfv.ngrp > pfv.ngrpmx: + if pfv.ngrp > pfv.n_pf_groups_max: eh.idiags[0] = pfv.ngrp - eh.idiags[1] = pfv.ngrpmx + eh.idiags[1] = pfv.n_pf_groups_max eh.report_error(64) # Total the number of PF coils in all groups, and check that none @@ -812,7 +812,7 @@ def efc( :param cfix: Fixed currents (A) :type cfix: np.ndarray :param ngrp: number of coil groups, where all coils in a group have the - same current, <= ngrpmx + same current, <= n_pf_groups_max :type ngrp: int :param ncls: number of coils in each group, each value <= nclsmx :type ncls: np.ndarray @@ -872,7 +872,9 @@ def efc( ) # Solve matrix equation - ccls = self.solv(pfv.ngrpmx, ngrp, nrws, gmat, bvec) + ccls = self.solv( + pfv.n_pf_groups_max, ngrp, nrws, gmat, bvec + ) # Calculate the norm of the residual vectors brssq, brnrm, bzssq, bznrm, ssq = rsid( @@ -925,7 +927,7 @@ def tf_pf_collision_detector(self): if pf_tf_collision >= 1: eh.report_error(277) - def solv(self, ngrpmx, ngrp, nrws, gmat, bvec): + def solv(self, n_pf_groups_max, ngrp, nrws, gmat, bvec): """Solve a matrix using singular value decomposition. This routine solves the matrix equation for calculating the @@ -935,10 +937,10 @@ def solv(self, ngrpmx, ngrp, nrws, gmat, bvec): author: J Galambos, ORNL author: P C Shipe, ORNL - :param ngrpmx: maximum number of PF coil groups - :type ngrpmx: int + :param n_pf_groups_max: maximum number of PF coil groups + :type n_pf_groups_max: int :param ngrp: number of coil groups, where all coils in a group have the - same current, <= ngrpmx + same current, <= n_pf_groups_max :type ngrp: int :param nrws: actual number of rows to use :type nrws: int @@ -951,7 +953,7 @@ def solv(self, ngrpmx, ngrp, nrws, gmat, bvec): :rtype: tuple[numpy.ndarray, numpy.ndarray, numpy.ndarray, numpy.ndarray, numpy.ndarray] """ - ccls = np.zeros(ngrpmx) + ccls = np.zeros(n_pf_groups_max) work2 = np.zeros(ngrpmx) umat, sigma, vmat = svd(gmat) @@ -3049,7 +3051,7 @@ def rsid(npts, brin, bzin, nfix, ngrp, ccls, bfix, gmat): :param nfix: number of coils with fixed currents, <= nfixmx :type nfix: int :param ngrp: number of coil groups, where all coils in a group have the - same current, <= ngrpmx + same current, <= n_pf_groups_max :type ngrp: int :param ccls: coil currents in each group (A) :type ccls: numpy.ndarray @@ -3168,10 +3170,10 @@ def mtrx( author: J Galambos, ORNL :param lrow1: row length of arrays bfix, bvec, gmat, umat, vmat; should - be >= (2*nptsmx + ngrpmx) + be >= (2*nptsmx + n_pf_groups_max) :type lrow1: int :param lcol1: column length of arrays gmat, umat, vmat; should be >= - ngrpmx + n_pf_groups_max :type lcol1: int :param npts: number of data points at which field is to be fixed; should be <= nptsmx @@ -3185,7 +3187,7 @@ def mtrx( :param bzin: field components at data points (T) :type bzin: numpy.ndarray :param ngrp: number of coil groups, where all coils in a group have the - same current, <= ngrpmx + same current, <= n_pf_groups_max :type ngrp: int :param ncls: number of coils in each group, each value <= nclsmx :type ncls: numpy.ndarray diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index 016a086fdd..2a4c2e5a39 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -328,7 +328,7 @@ { "no": 64, "level": 3, - "message": "PFCOIL: ngrp is larger than ngrpmx" + "message": "PFCOIL: ngrp is larger than n_pf_groups_max" }, { "no": 65, diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index fbd69fe1aa..d01b6a36a5 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -297,7 +297,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) epsvmc, ftol, ipnvars, ioptimz, nineqns, ipeqns, boundu, icc, ipnfoms, name_xc use pfcoil_variables, only: rhopfbus, rjconpf, zref, fcuohsu, oh_steel_frac, vf, & coheof, sigpfcalw, alstroh, ipfres, fcupfsu, fvssu, etapsu, i_cs_stress, & - fbmaxcs, ngc, rpf2, fcohbop, ohhghf, vfohc, isumatoh, ngrpmx, ngc2, rpf1, & + fbmaxcs, ngc, rpf2, fcohbop, ohhghf, vfohc, isumatoh, n_pf_groups_max, ngc2, rpf1, & ngrp, isumatpf, nfxfh, alfapf, routr, sigpfcf, pfclres, bmaxcs_lim, & ncls, nfixmx, cptdin, ipfloc, i_sup_pf_shape, rref, i_pf_current, & ccl0_ma, ccls_ma, ld_ratio_cst @@ -1850,7 +1850,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) call parse_real_variable('fcupfsu', fcupfsu, 0.0D0, 1.0D0, & 'Cu fraction of PF cable conductor') case ('ipfloc') - call parse_int_array('ipfloc', ipfloc, isub1, ngrpmx, & + call parse_int_array('ipfloc', ipfloc, isub1, n_pf_groups_max, & 'PF coil location', icode) case ('ipfres') call parse_int_variable('ipfres', ipfres, 0, 1, & @@ -1871,13 +1871,13 @@ subroutine parse_input_file(in_file,out_file,show_changes) call parse_int_variable('i_sup_pf_shape', i_sup_pf_shape, 0, 1, & 'Switch to place outboard PF coils when TF superconducting') case ('ncls') - call parse_int_array('ncls', ncls, isub1, ngrpmx+2, & + call parse_int_array('ncls', ncls, isub1, n_pf_groups_max+2, & 'No of coils in PF group', icode) case ('nfxfh') call parse_int_variable('nfxfh', nfxfh, 1, nfixmx/2, & 'Central Solenoid splitting parameter') case ('ngrp') - call parse_int_variable('ngrp', ngrp, 0, ngrpmx, & + call parse_int_variable('ngrp', ngrp, 0, n_pf_groups_max, & 'No of groups of PF coils') case ('ohhghf') call parse_real_variable('ohhghf', ohhghf, 0.0D0, 2.0D0, & @@ -1898,13 +1898,13 @@ subroutine parse_input_file(in_file,out_file,show_changes) call parse_real_variable('rpf2', rpf2, -3.0D0, 3.0D0, & 'Radial offset for location 2 PF coils') case ('rref') - call parse_real_array('rref', rref, isub1, ngrpmx, & + call parse_real_array('rref', rref, isub1, n_pf_groups_max, & 'radius of location 4 coil groups, minor radii from major radius', icode) case ('ccl0_ma') - call parse_real_array('ccl0_ma', ccl0_ma, isub1, ngrpmx, & + call parse_real_array('ccl0_ma', ccl0_ma, isub1, n_pf_groups_max, & 'Flux-swing cancel current of PF coil groups, MA', icode) case ('ccls_ma') - call parse_real_array('ccls_ma', ccls_ma, isub1, ngrpmx, & + call parse_real_array('ccls_ma', ccls_ma, isub1, n_pf_groups_max, & 'Equilibrium current of PF coil groups, MA', icode) case ('sigpfcalw') call parse_real_variable('sigpfcalw', sigpfcalw, 1.0D0, 1.0D3, & @@ -1919,7 +1919,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) call parse_real_variable('vfohc', vfohc, 0.0D0, 1.0D0, & 'Central Solenoid void fraction for coolant') case ('zref') - call parse_real_array('zref', zref, isub1, ngrpmx, & + call parse_real_array('zref', zref, isub1, n_pf_groups_max, & 'height of location 3 and 4 coil groups / minor radius', icode) case ('radius_fw_channel') diff --git a/source/fortran/pfcoil.f90 b/source/fortran/pfcoil.f90 index ec87282344..68be6d0b4e 100644 --- a/source/fortran/pfcoil.f90 +++ b/source/fortran/pfcoil.f90 @@ -13,7 +13,7 @@ module pfcoil_module use, intrinsic :: iso_fortran_env, only: dp=>real64 #endif use resistive_materials, only: volume_fractions, supercon_strand - use pfcoil_variables, only: nfixmx, ngrpmx, nclsmx, ngc2 + use pfcoil_variables, only: nfixmx, n_pf_groups_max, nclsmx, ngc2 implicit none public @@ -27,8 +27,8 @@ module pfcoil_module ! with f2py if made public ! #TODO Temporarily hardcode dimensions in order to make public and wrap ! real(dp), dimension(nfixmx), private :: rfxf,zfxf,cfxf,xind - ! real(dp), dimension(ngrpmx,nclsmx), private :: rcls,zcls - ! real(dp), dimension(ngrpmx), private :: ccls,ccl0 + ! real(dp), dimension(n_pf_groups_max,nclsmx), private :: rcls,zcls + ! real(dp), dimension(n_pf_groups_max), private :: ccls,ccl0 ! real(dp), dimension(ngc2), private :: bpf2 ! real(dp), dimension(ngc2,3), private :: vsdum real(dp), dimension(64) :: rfxf,zfxf,cfxf,xind diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 8dc543b8ee..db4033ffac 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -14,7 +14,7 @@ module pfcoil_variables public - integer, parameter :: ngrpmx = 10 + integer, parameter :: n_pf_groups_max = 10 !! maximum number of groups of PF coils integer, parameter :: nclsmx = 2 @@ -27,7 +27,7 @@ module pfcoil_variables integer, parameter :: nfixmx = 64 !! maximum number of fixed current PF coils - integer, parameter :: ngc = ngrpmx*nclsmx + integer, parameter :: ngc = n_pf_groups_max*nclsmx !! maximum total number of coils across all groups integer, parameter :: ngc2 = ngc+2 @@ -63,11 +63,11 @@ module pfcoil_variables real(dp), dimension(ngc2) :: bpf !! peak field at coil i (T) - real(dp), dimension(ngrpmx) :: ccl0_ma + real(dp), dimension(n_pf_groups_max) :: ccl0_ma !! PF group current array, flux-swing cancellation current (MA) !! Input if i_pf_current=0, computed otherwise - real(dp), dimension(ngrpmx) :: ccls_ma + real(dp), dimension(n_pf_groups_max) :: ccls_ma !! PF group current array, equilibrium current (MA) !! Input if i_pf_current=0, computed otherwise @@ -114,7 +114,7 @@ module pfcoil_variables real(dp) :: fvssu !! F-value for `constraint equation 51` - integer, dimension(ngrpmx) :: ipfloc + integer, dimension(n_pf_groups_max) :: ipfloc !! Switch for location of PF coil group i: !! !! - =1 PF coil on top of central solenoid (flux ramp only) @@ -201,7 +201,7 @@ module pfcoil_variables integer :: ncirt !! number of PF circuits (including central solenoid and plasma) - integer, dimension(ngrpmx+2) :: ncls + integer, dimension(n_pf_groups_max+2) :: ncls !! number of PF coils in group j integer :: nfxfh @@ -288,7 +288,7 @@ module pfcoil_variables !! offset (m) of radial position of `ipfloc=2` PF coils from being at !! rmajor (offset = rpf2*triang*rminor) - real(dp), dimension(ngrpmx) :: rref + real(dp), dimension(n_pf_groups_max) :: rref !! PF coil radial positioning adjuster: !! !! - for groups j with ipfloc(j) = 1; rref(j) is ignored @@ -374,7 +374,7 @@ module pfcoil_variables real(dp), dimension(ngc2) :: zpf !! z (height) location of PF coil i (m) - real(dp), dimension(ngrpmx) :: zref + real(dp), dimension(n_pf_groups_max) :: zref !! PF coil vertical positioning adjuster: !! !! - for groups j with ipfloc(j) = 1; zref(j) is ignored diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index cceb2981a6..7c7fd4275b 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3397,10 +3397,10 @@ "nflutfo": 0.0, "nfxf": 0.0, "nfxfh": 7.0, - "ngc": "ngrpmx*nclsmx", + "ngc": "n_pf_groups_max*nclsmx", "ngc2": "ngc+2", "ngrp": 3.0, - "ngrpmx": 10.0, + "n_pf_groups_max": 10.0, "ni0": 0.0, "n_impurities": 14.0, "nin": 10.0, @@ -10160,7 +10160,7 @@ "ngc": "maximum total number of coils across all groups", "ngc2": "new variable to include 2 additional circuits: plasma and central solenoid", "ngrp": "number of groups of PF coils. Symmetric coil pairs should all be in the same group", - "ngrpmx": "maximum number of groups of PF coils", + "n_pf_groups_max": "maximum number of groups of PF coils", "ni0": "central ion density (/m3)", "n_impurities": "n_impurities /14/ FIX : number of ion species in impurity radiation model", "nin": "", @@ -18918,7 +18918,7 @@ "croco_strand" ], "pfcoil_variables": [ - "ngrpmx", + "n_pf_groups_max", "nclsmx", "nptsmx", "nfixmx", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 4717e313c4..af22bd2930 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -280,11 +280,11 @@ def test_efc(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): :param monkeypatch: mocking fixture :type monkeypatch: MonkeyPatch """ - ngrpmx = 10 + n_pf_groups_max = 10 nptsmx = 32 nfixmx = 64 - lrow1 = 2 * nptsmx + ngrpmx - lcol1 = ngrpmx + lrow1 = 2 * nptsmx + n_pf_groups_max + lcol1 = n_pf_groups_max npts = 32 rpts = np.array([ 6.0547741935483881, @@ -407,6 +407,14 @@ def test_efc(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): bfix = np.full(lrow1, 0.0) gmat = np.full([lrow1, lcol1], 0.0, order="F") bvec = np.full(lrow1, 0.0) + rc = np.full(nclsmx, 0.0) + zc = np.full(nclsmx, 0.0) + cc = np.full(nclsmx, 0.0) + xc = np.full(nclsmx, 0.0) + umat = np.full([lrow1, lcol1], 0.0, order="F") + vmat = np.full([lrow1, lcol1], 0.0, order="F") + sigma = np.full(n_pf_groups_max, 0.0) + work2 = np.full(n_pf_groups_max, 0.0) ssq, ccls = pfcoil.efc( npts, @@ -1621,13 +1629,15 @@ def test_solv(pfcoil: PFCoil): :param pfcoil: a PFCoil instance :type pfcoil: process.pfcoil.PFCoil """ - ngrpmx = 3 + n_pf_groups_max = 3 ngrp = 3 nrws = 3 gmat = np.full((3, 3), 2.0, order="F") bvec = np.full(3, 1.0) - ccls = pfcoil.solv(ngrpmx, ngrp, nrws, gmat, bvec) + ccls = pfcoil.solv( + n_pf_groups_max, ngrp, nrws, gmat, bvec + ) assert_array_almost_equal(ccls, np.array([-0.069036, 0.488642, 0.080394])) From 8c0f8cf2b4b8a2dbebc05ecc6180aa30e6b73e31 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 11:36:20 +0000 Subject: [PATCH 02/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'isutamoh'=20to?= =?UTF-8?q?=20'i=5Fcs=5Fsuperconductor'=20across=20multiple=20files=20for?= =?UTF-8?q?=20consistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 4 +- examples/data/large_tokamak_1_MFILE.DAT | 4 +- examples/data/large_tokamak_2_MFILE.DAT | 4 +- examples/data/large_tokamak_3_MFILE.DAT | 4 +- examples/data/large_tokamak_4_MFILE.DAT | 4 +- examples/data/large_tokamak_IN.DAT | 2 +- examples/data/scan_MFILE.DAT | 20 ++++----- examples/data/scan_example_file_IN.DAT | 2 +- process/costs.py | 14 +++++-- process/init.py | 2 +- process/pfcoil.py | 42 +++++++++++-------- source/fortran/input.f90 | 6 +-- source/fortran/pfcoil_variables.f90 | 4 +- source/fortran/tfcoil_variables.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 4 +- .../data/large_tokamak_2_MFILE.DAT | 4 +- .../data/large_tokamak_3_MFILE.DAT | 4 +- .../data/large_tokamak_4_MFILE.DAT | 4 +- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +- .../data/large_tokamak_once_through.IN.DAT | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 32 +++++++------- tests/integration/data/scan_MFILE.DAT | 20 ++++----- .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 12 +++--- tests/integration/test_pfcoil_int.py | 4 +- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 4 +- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +- tests/unit/test_costs_1990.py | 12 +++--- 35 files changed, 127 insertions(+), 113 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index c005fd08e4..e232d8c252 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -773,7 +773,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.0573E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.3084E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3997E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5395E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0618E+08 OP @@ -1770,7 +1770,7 @@ zref(8) = 1.0 fcuohsu = 0.70 * ITER Nb3Sn parameterisation -isumatoh = 1 +i_cs_superconductor = 1 * TF Coil * *********** diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 8f554a3f05..dfba294db3 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -768,7 +768,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.9795E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1737E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP @@ -1764,7 +1764,7 @@ zref(8) = 1.0 fcuohsu = 0.70 * ITER Nb3Sn parameterisation -isumatoh = 1 +i_cs_superconductor = 1 * TF Coil * *********** diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 6082bc29ce..ec391edd69 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -768,7 +768,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.9795E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1737E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP @@ -1764,7 +1764,7 @@ zref(8) = 1.0 fcuohsu = 0.70 * ITER Nb3Sn parameterisation -isumatoh = 1 +i_cs_superconductor = 1 * TF Coil * *********** diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 9f03ff0b92..75c2a895b1 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -768,7 +768,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.9795E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1737E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP @@ -1765,7 +1765,7 @@ zref(8) = 1.0 fcuohsu = 0.70 * ITER Nb3Sn parameterisation -isumatoh = 1 +i_cs_superconductor = 1 * TF Coil * *********** diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index a9b5f4faa0..04592bcb2e 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -768,7 +768,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.9795E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1737E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP @@ -1765,7 +1765,7 @@ zref(8) = 1.0 fcuohsu = 0.70 * ITER Nb3Sn parameterisation -isumatoh = 1 +i_cs_superconductor = 1 * TF Coil * *********** diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 89099c6042..6e59413e75 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -575,7 +575,7 @@ zref(8) = 1.0 fcuohsu = 0.70 * ITER Nb3Sn parameterisation -isumatoh = 1 +i_cs_superconductor = 1 * TF Coil * *********** diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index c6b477d872..9de0706ba1 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -616,7 +616,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 7.5516E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 5 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP @@ -1611,7 +1611,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 7.5516E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 5 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP @@ -2606,7 +2606,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 7.5516E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 5 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP @@ -3601,7 +3601,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 7.5516E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 5 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP @@ -4596,7 +4596,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 7.5516E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 5 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP @@ -5591,7 +5591,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 7.5516E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 5 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP @@ -6586,7 +6586,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 7.5516E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 5 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP @@ -7581,7 +7581,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 7.5516E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 5 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP @@ -8576,7 +8576,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 7.5516E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 5 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP @@ -9224,7 +9224,7 @@ zref(8) = 1.0 alstroh = 6.6D8 * allowable hoop stress in Central Solenoid structural material (Pa) fcuohsu = 0.70 * copper fraction of strand in central solenoid cable -isumatoh = 5 * WST Nb3Sn parameterisation +i_cs_superconductor = 5 * WST Nb3Sn parameterisation oh_steel_frac = 0.8 *----------------Physics Variables-----------------* diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 792b2e5a11..3b8a682f1e 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -575,7 +575,7 @@ zref(8) = 1.0 fcuohsu = 0.70 * ITER Nb3Sn parameterisation -isumatoh = 1 +i_cs_superconductor = 1 * TF Coil * *********** diff --git a/process/costs.py b/process/costs.py index 1a7042e2af..356d15d56f 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1648,20 +1648,26 @@ def acc2222(self): # Issue #328 Use CS conductor cross-sectional area (m2) if pfcoil_variables.ipfres == 0: costpfsc = ( - cost_variables.ucsc[pfcoil_variables.isumatoh - 1] + cost_variables.ucsc[pfcoil_variables.i_cs_superconductor - 1] * pfcoil_variables.awpoh * (1 - pfcoil_variables.vfohc) * (1 - pfcoil_variables.fcuohsu) / pfcoil_variables.turns[pfcoil_variables.nohc - 1] - * tfcoil_variables.dcond[pfcoil_variables.isumatoh - 1] + * tfcoil_variables.dcond[ + pfcoil_variables.i_cs_superconductor - 1 + ] ) else: costpfsc = 0.0e0 else: if pfcoil_variables.ipfres == 0: costpfsc = ( - cost_variables.sc_mat_cost_0[pfcoil_variables.isumatoh - 1] - * tfcoil_variables.j_crit_str_0[pfcoil_variables.isumatoh - 1] + cost_variables.sc_mat_cost_0[ + pfcoil_variables.i_cs_superconductor - 1 + ] + * tfcoil_variables.j_crit_str_0[ + pfcoil_variables.i_cs_superconductor - 1 + ] / pfcoil_variables.j_crit_str_cs ) else: diff --git a/process/init.py b/process/init.py index 4a47e85100..3688ab874d 100644 --- a/process/init.py +++ b/process/init.py @@ -1243,7 +1243,7 @@ def check_process(): # Cannot use temperature margin constraint with REBCO CS coils if ( fortran.numerics.icc[: fortran.numerics.neqns + fortran.numerics.nineqns] == 60 - ).any() and fortran.pfcoil_variables.isumatoh == 8: + ).any() and fortran.pfcoil_variables.i_cs_superconductor == 8: raise ProcessValidationError( "turn off CS temperature margin constraint icc = 60 when using REBCO" ) diff --git a/process/pfcoil.py b/process/pfcoil.py index 74bf135739..dc4f135e4c 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -629,7 +629,7 @@ def pfcoil(self): # Strand critical current calculation for costing in $/kAm # = superconducting filaments jc * (1 - strand copper fraction) - if pfv.isumatoh.item() in {2, 6, 8}: + if pfv.i_cs_superconductor.item() in {2, 6, 8}: pfv.j_crit_str_pf = jsc else: pfv.j_crit_str_pf = jsc * (1 - pfv.fcupfsu) @@ -1157,7 +1157,7 @@ def ohcalc(self): * 2.0e0 * constants.pi * pfv.rpf[pfv.nohc - 1] - * tfv.dcond[pfv.isumatoh - 1] + * tfv.dcond[pfv.i_cs_superconductor - 1] ) else: pfv.wtc[pfv.nohc - 1] = ( @@ -1178,7 +1178,7 @@ def ohcalc(self): pfv.vfohc, pfv.fcuohsu, (abs(pfv.ric[pfv.nohc - 1]) / pfv.awpoh) * 1.0e6, - pfv.isumatoh, + pfv.i_cs_superconductor, tfv.fhts, tfv.str_cs_con_res, tfv.tftmp, @@ -1187,7 +1187,7 @@ def ohcalc(self): ) # Strand critical current calculation for costing in $/kAm # = superconducting filaments jc * (1 - strand copper fraction) - if pfv.isumatoh.item() in {2, 6, 8}: + if pfv.i_cs_superconductor.item() in {2, 6, 8}: pfv.j_crit_str_cs = pfv.jscoh_eof else: pfv.j_crit_str_cs = pfv.jscoh_eof * (1 - pfv.fcuohsu) @@ -1201,7 +1201,7 @@ def ohcalc(self): pfv.vfohc, pfv.fcuohsu, (abs(pfv.ric[pfv.nohc - 1]) / pfv.awpoh) * 1.0e6, - pfv.isumatoh, + pfv.i_cs_superconductor, tfv.fhts, tfv.str_cs_con_res, tfv.tftmp, @@ -1845,38 +1845,38 @@ def outpf(self): op.ovarin( self.outfile, "Central solenoid superconductor material", - "(isumatoh)", - pfv.isumatoh, + "(i_cs_superconductor)", + pfv.i_cs_superconductor, ) - if pfv.isumatoh == 1: + if pfv.i_cs_superconductor == 1: op.ocmmnt(self.outfile, " (ITER Nb3Sn critical surface model)") - elif pfv.isumatoh == 2: + elif pfv.i_cs_superconductor == 2: op.ocmmnt( self.outfile, " (Bi-2212 high temperature superconductor)" ) - elif pfv.isumatoh == 3: + elif pfv.i_cs_superconductor == 3: op.ocmmnt(self.outfile, " (NbTi)") - elif pfv.isumatoh == 4: + elif pfv.i_cs_superconductor == 4: op.ocmmnt( self.outfile, " (ITER Nb3Sn critical surface model, user-defined parameters)", ) - elif pfv.isumatoh == 5: + elif pfv.i_cs_superconductor == 5: op.ocmmnt(self.outfile, " (WST Nb3Sn critical surface model)") - elif pfv.isumatoh == 6: + elif pfv.i_cs_superconductor == 6: op.ocmmnt(self.outfile, " (REBCO HTS)") - elif pfv.isumatoh == 7: + elif pfv.i_cs_superconductor == 7: op.ocmmnt( self.outfile, " (Durham Ginzburg-Landau critical surface model for Nb-Ti)", ) - elif pfv.isumatoh == 8: + elif pfv.i_cs_superconductor == 8: op.ocmmnt( self.outfile, " (Durham Ginzburg-Landau critical surface model for REBCO)", ) - elif pfv.isumatoh == 9: + elif pfv.i_cs_superconductor == 9: op.ocmmnt( self.outfile, " (Hazelton experimental data + Zhai conceptual model for REBCO)", @@ -2062,7 +2062,11 @@ def outpf(self): pfv.fcuohsu, ) # If REBCO material is used, print copperaoh_m2 - if pfv.isumatoh == 6 or pfv.isumatoh == 8 or pfv.isumatoh == 9: + if ( + pfv.i_cs_superconductor == 6 + or pfv.i_cs_superconductor == 8 + or pfv.i_cs_superconductor == 9 + ): op.ovarre( self.outfile, "CS current/copper area (A/m2)", @@ -2197,7 +2201,9 @@ def outpf(self): # REBCO fractures in strains above ~+/- 0.7% if ( - pfv.isumatoh == 6 or pfv.isumatoh == 8 or pfv.isumatoh == 9 + pfv.i_cs_superconductor == 6 + or pfv.i_cs_superconductor == 8 + or pfv.i_cs_superconductor == 9 ) and abs(tfv.str_cs_con_res) > 0.7e-2: eh.report_error(262) diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index d01b6a36a5..7b9dcb3746 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -297,7 +297,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) epsvmc, ftol, ipnvars, ioptimz, nineqns, ipeqns, boundu, icc, ipnfoms, name_xc use pfcoil_variables, only: rhopfbus, rjconpf, zref, fcuohsu, oh_steel_frac, vf, & coheof, sigpfcalw, alstroh, ipfres, fcupfsu, fvssu, etapsu, i_cs_stress, & - fbmaxcs, ngc, rpf2, fcohbop, ohhghf, vfohc, isumatoh, n_pf_groups_max, ngc2, rpf1, & + fbmaxcs, ngc, rpf2, fcohbop, ohhghf, vfohc, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & ngrp, isumatpf, nfxfh, alfapf, routr, sigpfcf, pfclres, bmaxcs_lim, & ncls, nfixmx, cptdin, ipfloc, i_sup_pf_shape, rref, i_pf_current, & ccl0_ma, ccls_ma, ld_ratio_cst @@ -1855,8 +1855,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('ipfres') call parse_int_variable('ipfres', ipfres, 0, 1, & 'Switch for supercond / resist PF coils') - case ('isumatoh') - call parse_int_variable('isumatoh', isumatoh, 1, 9, & + case ('i_cs_superconductor') + call parse_int_variable('i_cs_superconductor', i_cs_superconductor, 1, 9, & 'Central Solenoid superconductor material') case ('isumatpf') call parse_int_variable('isumatpf', isumatpf, 1, 9, & diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index db4033ffac..8dd4c0c0e6 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -131,7 +131,7 @@ module pfcoil_variables real(dp) :: itr_sum !! total sum of I x turns x radius for all PF coils and CS (Am) - integer :: isumatoh + integer :: i_cs_superconductor !! switch for superconductor material in central solenoid: !! !! - =1 ITER Nb3Sn critical surface model with standard @@ -446,7 +446,7 @@ subroutine init_pfcoil_variables ipfloc = (/2,2,3,0,0,0,0,0,0,0/) ipfres = 0 itr_sum = 0.0D0 - isumatoh = 1 + i_cs_superconductor = 1 isumatpf = 1 j_crit_str_cs = 0.0D0 j_crit_str_pf = 0.0D0 diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 7a081cb487..a625872e79 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -151,7 +151,7 @@ module tfcoil_variables !! density of coil case (kg/m3) real(dp), dimension(9) :: dcond - !! density of superconductor type given by i_tf_sc_mat/isumatoh/isumatpf (kg/m3) + !! density of superconductor type given by i_tf_sc_mat/i_cs_superconductor/isumatpf (kg/m3) real(dp) :: dcondins !! density of conduit + ground-wall insulation (kg/m3) diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 747eaeeb15..58f572d6d1 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -767,7 +767,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.9795E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1737E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP @@ -1763,7 +1763,7 @@ zref(8) = 1.0 fcuohsu = 0.70 * ITER Nb3Sn parameterisation -isumatoh = 1 +i_cs_superconductor = 1 * TF Coil * *********** diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index ac23368142..5f49557c88 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -768,7 +768,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.9795E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1737E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP @@ -1764,7 +1764,7 @@ zref(8) = 1.0 fcuohsu = 0.70 * ITER Nb3Sn parameterisation -isumatoh = 1 +i_cs_superconductor = 1 * TF Coil * *********** diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 2c12638313..ddc7c0d15d 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -768,7 +768,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.9795E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1737E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP @@ -1764,7 +1764,7 @@ zref(8) = 1.0 fcuohsu = 0.70 * ITER Nb3Sn parameterisation -isumatoh = 1 +i_cs_superconductor = 1 * TF Coil * *********** diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 76d46c3c62..9aebf957c2 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -768,7 +768,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.9795E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1737E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP @@ -1764,7 +1764,7 @@ zref(8) = 1.0 fcuohsu = 0.70 * ITER Nb3Sn parameterisation -isumatoh = 1 +i_cs_superconductor = 1 * TF Coil * *********** diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 4a080f53c0..b65112b8c1 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -574,7 +574,7 @@ zref(8) = 1.0 fcuohsu = 0.70 * ITER Nb3Sn parameterisation -isumatoh = 1 +i_cs_superconductor = 1 * TF Coil * *********** diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 7b1ee38b4a..74109c626b 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -771,7 +771,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.7930E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1458E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4055E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4872E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0462E+08 OP @@ -1765,7 +1765,7 @@ zref(8) = 1.0 fcuohsu = 0.70 * ITER Nb3Sn parameterisation -isumatoh = 1 +i_cs_superconductor = 1 * TF Coil * *********** diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 87297a64d4..c7b15594e4 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -284,7 +284,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * peak current fcohbop = 0.93491189654662 * ratio of central solenoid overall current density at beginning of pulse / end of flat-top fcuohsu = 0.70 * copper fraction of strand in central solenoid ipfloc = 2,2,3,3 * Switch for location of PF coil group i; -isumatoh = 1 * switch for superconductor material in central solenoid; +i_cs_superconductor = 1 * switch for superconductor material in central solenoid; isumatpf = 3 * switch for superconductor material in PF coils; ncls = 1,1,2,2 * number of PF coils in group j ngrp = 4 * number of groups of PF coils; Symmetric coil pairs should all be in the same group diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 82429c74bd..01749ec9c6 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -245,7 +245,7 @@ zref(8) = 1.0 alstroh = 6.6D8 * allowable hoop stress in Central Solenoid structural material (Pa) fcuohsu = 0.70 * copper fraction of strand in central solenoid cable -isumatoh = 5 * WST Nb3Sn parameterisation +i_cs_superconductor = 5 * WST Nb3Sn parameterisation oh_steel_frac = 0.8 *----------------Physics Variables-----------------* diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index deeab76ab0..46098ed6de 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -769,7 +769,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.8267E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2414E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4070E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4743E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0423E+08 OP @@ -1932,7 +1932,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.8260E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2925E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4035E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5050E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0515E+08 OP @@ -3095,7 +3095,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.7563E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.3450E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4029E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5107E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0532E+08 OP @@ -4258,7 +4258,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.7532E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.3452E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4028E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5119E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0536E+08 OP @@ -5421,7 +5421,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.8601E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2904E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4026E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5139E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0542E+08 OP @@ -6584,7 +6584,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.9844E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2344E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3979E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5564E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0669E+08 OP @@ -7747,7 +7747,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.9757E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2345E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3965E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5690E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0707E+08 OP @@ -8910,7 +8910,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.9068E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2870E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3964E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5698E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0709E+08 OP @@ -10073,7 +10073,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.8260E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.3353E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3954E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5786E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0736E+08 OP @@ -11236,7 +11236,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.8265E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.3353E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3952E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5809E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0743E+08 OP @@ -12399,7 +12399,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.9124E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2788E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3979E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5563E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0669E+08 OP @@ -13562,7 +13562,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.9989E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2215E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3997E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5397E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0619E+08 OP @@ -14725,7 +14725,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.9982E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2217E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3996E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5406E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0622E+08 OP @@ -15888,7 +15888,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.9278E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2711E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3991E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5452E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0636E+08 OP @@ -17051,7 +17051,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.8545E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.3194E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3986E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5494E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0648E+08 OP @@ -18051,7 +18051,7 @@ zref(8) = 1.0 fcuohsu = 0.70 * ITER Nb3Sn parameterisation -isumatoh = 1 +i_cs_superconductor = 1 * TF Coil * *********** diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index f758965959..90d8213f43 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -616,7 +616,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 7.5516E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 5 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP @@ -1611,7 +1611,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 7.5516E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 5 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP @@ -2606,7 +2606,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 7.5516E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 5 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP @@ -3601,7 +3601,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 7.5516E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 5 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP @@ -4596,7 +4596,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 7.5516E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 5 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP @@ -5591,7 +5591,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 7.5516E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 5 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP @@ -6586,7 +6586,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 7.5516E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 5 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP @@ -7581,7 +7581,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 7.5516E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 5 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP @@ -8576,7 +8576,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 7.5516E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 5 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP @@ -9224,7 +9224,7 @@ zref(8) = 1.0 alstroh = 6.6D8 * allowable hoop stress in Central Solenoid structural material (Pa) fcuohsu = 0.70 * copper fraction of strand in central solenoid cable -isumatoh = 5 * WST Nb3Sn parameterisation +i_cs_superconductor = 5 * WST Nb3Sn parameterisation oh_steel_frac = 0.8 *----------------Physics Variables-----------------* diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 77e155778e..6372fdce93 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -245,7 +245,7 @@ zref(8) = 1.0 alstroh = 6.6D8 * allowable hoop stress in Central Solenoid structural material (Pa) fcuohsu = 0.70 * copper fraction of strand in central solenoid cable -isumatoh = 5 * WST Nb3Sn parameterisation +i_cs_superconductor = 5 * WST Nb3Sn parameterisation oh_steel_frac = 0.8 *----------------Physics Variables-----------------* diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index 0336383cdb..909822b4d7 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -245,7 +245,7 @@ zref(8) = 1.0 alstroh = 6.6D8 * allowable hoop stress in Central Solenoid structural material (Pa) fcuohsu = 0.70 * copper fraction of strand in central solenoid cable -isumatoh = 5 * WST Nb3Sn parameterisation +i_cs_superconductor = 5 * WST Nb3Sn parameterisation oh_steel_frac = 0.8 *----------------Physics Variables-----------------* diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 7c7fd4275b..ee31555873 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2672,7 +2672,7 @@ "istell": 0.0, "isthtr": 3.0, "istore": 1.0, - "isumatoh": 1.0, + "i_cs_superconductor": 1.0, "isumatpf": 1.0, "isweep": 0.0, "isweep_2": 0.0, @@ -9258,7 +9258,7 @@ "dcdrv0": "IFE generic/laser driver cost gradient (M$/MJ)", "dcdrv1": "HIB driver cost gradient at low energy (M$/MJ)", "dcdrv2": "HIB driver cost gradient at high energy (M$/MJ)", - "dcond": "density of superconductor type given by i_tf_sc_mat/isumatoh/isumatpf (kg/m3)", + "dcond": "density of superconductor type given by i_tf_sc_mat/i_cs_superconductor/isumatpf (kg/m3)", "dcondins": "density of conduit + ground-wall insulation (kg/m3)", "dcopper": "density of copper (kg/m3)", "dr_cryostat": "cryostat thickness (m)", @@ -9909,7 +9909,7 @@ "istell": "Switch for stellarator option (set via `device.dat`):\n", "isthtr": "Switch for stellarator auxiliary heating method:\n", "istore": "Switch for thermal storage method:\n", - "isumatoh": "switch for superconductor material in central solenoid:\n", + "i_cs_superconductor": "switch for superconductor material in central solenoid:\n", "isumatpf": "switch for superconductor material in PF coils:\n", "isweep": "Number of scan points to calculate", "isweep_2": "Number of 2D scan points to calculate", @@ -13505,7 +13505,7 @@ "lb": 1, "ub": 3 }, - "isumatoh": { + "i_cs_superconductor": { "lb": 1, "ub": 8 }, @@ -18951,7 +18951,7 @@ "ipfloc", "ipfres", "itr_sum", - "isumatoh", + "i_cs_superconductor", "isumatpf", "i_pf_current", "i_sup_pf_shape", @@ -20491,7 +20491,7 @@ "istell": "int_variable", "isthtr": "int_variable", "istore": "int_variable", - "isumatoh": "int_variable", + "i_cs_superconductor": "int_variable", "isumatpf": "int_variable", "isweep": "int_variable", "isweep_2": "int_variable", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index af22bd2930..97aa6d7c84 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -104,7 +104,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "ra", np.full(22, 0.0)) monkeypatch.setattr(pfv, "rb", np.full(22, 0.0)) monkeypatch.setattr(pfv, "isumatpf", 3) - monkeypatch.setattr(pfv, "isumatoh", 1) + monkeypatch.setattr(pfv, "i_cs_superconductor", 1) monkeypatch.setattr(pfv, "whtpf", 0.0) monkeypatch.setattr(pfv, "fcupfsu", 6.900e-1) monkeypatch.setattr(pfv, "cohbop", 1.693e7) @@ -197,7 +197,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "vfohc", 3.0e-1) monkeypatch.setattr(pfv, "jcableoh_bop", 1.069e8) monkeypatch.setattr(pfv, "fcuohsu", 7.000e-1) - monkeypatch.setattr(pfv, "isumatoh", 5) + monkeypatch.setattr(pfv, "i_cs_superconductor", 5) monkeypatch.setattr(pfv, "ohhghf", 0.9) monkeypatch.setattr(pfv, "areaoh", 1.039e1) monkeypatch.setattr(pfv, "powpfres", 0.0) diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index e7bf1bd32e..59fc787c33 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -574,7 +574,7 @@ zref(8) = 1.0 fcuohsu = 0.70 * ITER Nb3Sn parameterisation -isumatoh = 1 +i_cs_superconductor = 1 * Fraction of JxB force supported by PF coil case sigpfcf = 0.666 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index cf37dc6979..45719c2e0f 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -556,7 +556,7 @@ zref(8) = 1.0 fcuohsu = 0.70 * ITER Nb3Sn parameterisation -isumatoh = 1 +i_cs_superconductor = 1 * TF Coil * *********** diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index 20c8d5f08e..2b35f0349c 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -284,7 +284,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * peak current fcohbop = 0.93491189654662 * ratio of central solenoid overall current density at beginning of pulse / end of flat-top fcuohsu = 0.70 * copper fraction of strand in central solenoid ipfloc = 2,2,3,3 * Switch for location of PF coil group i; -isumatoh = 1 * switch for superconductor material in central solenoid; +i_cs_superconductor = 1 * switch for superconductor material in central solenoid; isumatpf = 3 * switch for superconductor material in PF coils; ncls = 1,1,2,2 * number of PF coils in group j ngrp = 4 * number of groups of PF coils; Symmetric coil pairs should all be in the same group diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index be0a6a6118..7f4fff3cf9 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -950,7 +950,7 @@ i_tf_sc_mat = 9 * JUSTIFICATION: Not used as not i_tf_sc_mat=4 *dcond = -* DESCRIPTION: Density of superconductor type given by i_tf_sc_mat/isumatoh/isumatpf (kg/m3) +* DESCRIPTION: Density of superconductor type given by i_tf_sc_mat/i_cs_superconductor/isumatpf (kg/m3) * JUSTIFICATION: Not set, assuming default *quench_model = @@ -1641,7 +1641,7 @@ ipfres = 0 * Conductor Type * *----------------* -*isumatoh = +*i_cs_superconductor = * DESCRIPTION: Central Solenoid superconductor material * JUSTIFICATION: Not set, resistive CS diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 8ca90699b8..128ac168ef 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -575,7 +575,7 @@ zref(8) = 1.0 fcuohsu = 0.70 * ITER Nb3Sn parameterisation -isumatoh = 1 +i_cs_superconductor = 1 * TF Coil * *********** diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 09a3eea122..b85652049f 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -771,7 +771,7 @@ Actual_current_(A)______________________________________________________ (cpttf)_______________________ 8.7930E+04 ITV Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1458E-01 OP # Central Solenoid and PF Coils # - Central_solenoid_superconductor_material________________________________ (isumatoh)____________________ 1 + Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4055E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4872E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0462E+08 OP @@ -1766,7 +1766,7 @@ zref(8) = 1.0 fcuohsu = 0.70 * ITER Nb3Sn parameterisation -isumatoh = 1 +i_cs_superconductor = 1 * TF Coil * *********** diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index f32792b51a..19a4f02b8f 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -2042,7 +2042,7 @@ class Acc2222Param(NamedTuple): rpf: Any = None - isumatoh: Any = None + i_cs_superconductor: Any = None fcupfsu: Any = None @@ -2224,7 +2224,7 @@ class Acc2222Param(NamedTuple): ), order="F", ).transpose(), - isumatoh=5, + i_cs_superconductor=5, fcupfsu=0.68999999999999995, fcuohsu=0.70000000000000007, vf=np.array( @@ -2420,7 +2420,7 @@ class Acc2222Param(NamedTuple): ), order="F", ).transpose(), - isumatoh=5, + i_cs_superconductor=5, fcupfsu=0.68999999999999995, fcuohsu=0.70000000000000007, vf=np.array( @@ -2616,7 +2616,7 @@ class Acc2222Param(NamedTuple): ), order="F", ).transpose(), - isumatoh=5, + i_cs_superconductor=5, fcupfsu=0.68999999999999995, fcuohsu=0.70000000000000007, vf=np.array( @@ -2731,7 +2731,9 @@ def test_acc2222(acc2222param, monkeypatch, costs): monkeypatch.setattr(pfcoil_variables, "rpf", acc2222param.rpf) - monkeypatch.setattr(pfcoil_variables, "isumatoh", acc2222param.isumatoh) + monkeypatch.setattr( + pfcoil_variables, "i_cs_superconductor", acc2222param.i_cs_superconductor + ) monkeypatch.setattr(pfcoil_variables, "fcupfsu", acc2222param.fcupfsu) From 2c1dfa219651fcd3ea599a2380ee37ee53710677 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 11:38:54 +0000 Subject: [PATCH 03/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'isutampf'=20to?= =?UTF-8?q?=20'i=5Fpf=5Fsuperconductor'=20across=20multiple=20files=20for?= =?UTF-8?q?=20consistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/central-solenoid.md | 4 +-- .../proc-pages/eng-models/pf-coil.md | 4 +-- .../data/csv_output_large_tokamak_MFILE.DAT | 4 +-- examples/data/large_tokamak_1_MFILE.DAT | 4 +-- examples/data/large_tokamak_2_MFILE.DAT | 4 +-- examples/data/large_tokamak_3_MFILE.DAT | 4 +-- examples/data/large_tokamak_4_MFILE.DAT | 4 +-- examples/data/large_tokamak_IN.DAT | 2 +- examples/data/scan_MFILE.DAT | 20 ++++++------ examples/data/scan_example_file_IN.DAT | 2 +- process/costs.py | 14 +++++--- process/pfcoil.py | 32 +++++++++++-------- process/utilities/errorlist.json | 2 +- source/fortran/input.f90 | 6 ++-- source/fortran/pfcoil_variables.f90 | 4 +-- source/fortran/tfcoil_variables.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 4 +-- .../data/large_tokamak_2_MFILE.DAT | 4 +-- .../data/large_tokamak_3_MFILE.DAT | 4 +-- .../data/large_tokamak_4_MFILE.DAT | 4 +-- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +-- .../data/large_tokamak_once_through.IN.DAT | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 32 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 20 ++++++------ .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 12 +++---- tests/integration/test_pfcoil_int.py | 2 +- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 4 +-- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +-- tests/unit/test_costs_1990.py | 12 ++++--- 37 files changed, 124 insertions(+), 112 deletions(-) diff --git a/documentation/proc-pages/eng-models/central-solenoid.md b/documentation/proc-pages/eng-models/central-solenoid.md index e5bf1971d1..eb6996a739 100644 --- a/documentation/proc-pages/eng-models/central-solenoid.md +++ b/documentation/proc-pages/eng-models/central-solenoid.md @@ -12,8 +12,8 @@ that no central solenoid is present, in which case the thickness `dr_cs` should coils should be located at positions defined by `ipfloc(j)` = 1 if no central solenoid is present. The central solenoid can be either resistive or superconducting (controlled via switch `ipfres` as -for the other PF coils), and if superconducting, switch `isumatpf` determines the superconducting -material to use - its value is used like `isumattf` and `isumatpf`. The copper fraction (by volume) +for the other PF coils), and if superconducting, switch `i_pf_superconductor` determines the superconducting +material to use - its value is used like `isumattf` and `i_pf_superconductor`. The copper fraction (by volume) of the superconducting strands is `fcuohsu`. The hoop stress is calculated using equations 4.10 and 4.11 from "Superconducting magnets", Martin N. diff --git a/documentation/proc-pages/eng-models/pf-coil.md b/documentation/proc-pages/eng-models/pf-coil.md index a4b5970151..2d0788abb2 100644 --- a/documentation/proc-pages/eng-models/pf-coil.md +++ b/documentation/proc-pages/eng-models/pf-coil.md @@ -61,8 +61,8 @@ The PF coils can be either resistive or superconducting. This is determined from `ipfres`. If `ipfres` = 0, the PF coils and the central solenoid are assumed to be superconducting. If `ipfres` = 1, they are assumed to be resistive, with their resistivity given by the value of variable `pfclres`. -If `ipfres` = 0, switch `isumatpf` specifies which superconducting material is to be used for the -PF coils. The values of `isumatpf` are used in the same way as switch `isumattf` is for the TF coils. +If `ipfres` = 0, switch `i_pf_superconductor` specifies which superconducting material is to be used for the +PF coils. The values of `i_pf_superconductor` are used in the same way as switch `isumattf` is for the TF coils. The fraction of copper present in the superconducting filaments if given by the value of variable `fcupfsu`. diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index e232d8c252..5a577287ca 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -817,7 +817,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.5693E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 4.2524E+02 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -1740,7 +1740,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 ipfloc = 2,2,3,3 * Switch for superconductor material in pf coils -isumatpf = 3 +i_pf_superconductor = 3 * Number of pf coils in group j ncls = 1,1,2,2 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index dfba294db3..296a1573fb 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -812,7 +812,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3514E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3378E+02 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -1734,7 +1734,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 ipfloc = 2,2,3,3 * Switch for superconductor material in pf coils -isumatpf = 3 +i_pf_superconductor = 3 * Number of pf coils in group j ncls = 1,1,2,2 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index ec391edd69..c1ce22aa09 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -812,7 +812,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3514E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3378E+02 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -1734,7 +1734,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 ipfloc = 2,2,3,3 * Switch for superconductor material in pf coils -isumatpf = 3 +i_pf_superconductor = 3 * Number of pf coils in group j ncls = 1,1,2,2 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 75c2a895b1..f372dcde3d 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -812,7 +812,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3514E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3378E+02 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -1735,7 +1735,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 ipfloc = 2,2,3,3 * Switch for superconductor material in pf coils -isumatpf = 3 +i_pf_superconductor = 3 * Number of pf coils in group j ncls = 1,1,2,2 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 04592bcb2e..9e04525ebe 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -812,7 +812,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3514E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3378E+02 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -1735,7 +1735,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 ipfloc = 2,2,3,3 * Switch for superconductor material in pf coils -isumatpf = 3 +i_pf_superconductor = 3 * Number of pf coils in group j ncls = 1,1,2,2 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 6e59413e75..0cf2aa777f 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -545,7 +545,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 ipfloc = 2,2,3,3 * Switch for superconductor material in pf coils -isumatpf = 3 +i_pf_superconductor = 3 * Number of pf coils in group j ncls = 1,1,2,2 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 9de0706ba1..5ba6c6fdba 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -648,7 +648,7 @@ Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -1643,7 +1643,7 @@ Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -2638,7 +2638,7 @@ Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -3633,7 +3633,7 @@ Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -4628,7 +4628,7 @@ Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -5623,7 +5623,7 @@ Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -6618,7 +6618,7 @@ Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -7613,7 +7613,7 @@ Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -8608,7 +8608,7 @@ Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -9206,7 +9206,7 @@ coheof = 13540000.0 * Central solenoid overall current density at end of flat- cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at ipfloc = 2,2,3,3 * Switch for locating scheme of pf coil group i; -isumatpf = 3 * Switch for superconductor material in pf coils; +i_pf_superconductor = 3 * Switch for superconductor material in pf coils; ncls = 1,1,2,2, * Number of pf coils in group j ngrp = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 3b8a682f1e..fe3787bb1f 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -545,7 +545,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 ipfloc = 2,2,3,3 * Switch for superconductor material in pf coils -isumatpf = 3 +i_pf_superconductor = 3 * Number of pf coils in group j ncls = 1,1,2,2 diff --git a/process/costs.py b/process/costs.py index 356d15d56f..5c24b4d149 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1581,21 +1581,27 @@ def acc2222(self): if cost_variables.supercond_cost_model == 0: if pfcoil_variables.ipfres == 0: costpfsc = ( - cost_variables.ucsc[pfcoil_variables.isumatpf - 1] + cost_variables.ucsc[pfcoil_variables.i_pf_superconductor - 1] * (1.0e0 - pfcoil_variables.fcupfsu) * (1.0e0 - pfcoil_variables.vf[i]) * abs(pfcoil_variables.ric[i] / pfcoil_variables.turns[i]) * 1.0e6 / pfcoil_variables.rjconpf[i] - * tfcoil_variables.dcond[pfcoil_variables.isumatpf - 1] + * tfcoil_variables.dcond[ + pfcoil_variables.i_pf_superconductor - 1 + ] ) else: costpfsc = 0.0e0 else: if pfcoil_variables.ipfres == 0: costpfsc = ( - cost_variables.sc_mat_cost_0[pfcoil_variables.isumatpf - 1] - * tfcoil_variables.j_crit_str_0[pfcoil_variables.isumatpf - 1] + cost_variables.sc_mat_cost_0[ + pfcoil_variables.i_pf_superconductor - 1 + ] + * tfcoil_variables.j_crit_str_0[ + pfcoil_variables.i_pf_superconductor - 1 + ] / pfcoil_variables.j_crit_str_pf ) else: diff --git a/process/pfcoil.py b/process/pfcoil.py index dc4f135e4c..3ce498a24f 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -619,7 +619,7 @@ def pfcoil(self): pfv.vf[i], pfv.fcupfsu, pfv.rjconpf[i], - pfv.isumatpf, + pfv.i_pf_superconductor, tfv.fhts, tfv.str_pf_con_res, tfv.tftmp, @@ -660,7 +660,9 @@ def pfcoil(self): if pfv.ipfres == 0: pfv.wtc[i] = ( - volpf * tfv.dcond[pfv.isumatpf - 1] * (1.0e0 - pfv.vf[i]) + volpf + * tfv.dcond[pfv.i_pf_superconductor - 1] + * (1.0e0 - pfv.vf[i]) ) else: pfv.wtc[i] = volpf * constants.dcopper * (1.0e0 - pfv.vf[i]) @@ -2208,7 +2210,9 @@ def outpf(self): eh.report_error(262) if ( - pfv.isumatpf == 6 or pfv.isumatpf == 8 or pfv.isumatpf == 9 + pfv.i_pf_superconductor == 6 + or pfv.i_pf_superconductor == 8 + or pfv.i_pf_superconductor == 9 ) and abs(tfv.str_pf_con_res) > 0.7e-2: eh.report_error(263) @@ -2222,39 +2226,39 @@ def outpf(self): op.ovarin( self.outfile, "PF coil superconductor material", - "(isumatpf)", - pfv.isumatpf, + "(i_pf_superconductor)", + pfv.i_pf_superconductor, ) - if pfv.isumatpf == 1: + if pfv.i_pf_superconductor == 1: op.ocmmnt(self.outfile, " (ITER Nb3Sn critical surface model)") - elif pfv.isumatpf == 2: + elif pfv.i_pf_superconductor == 2: op.ocmmnt(self.outfile, " (Bi-2212 high temperature superconductor)") - elif pfv.isumatpf == 3: + elif pfv.i_pf_superconductor == 3: op.ocmmnt(self.outfile, " (NbTi)") - elif pfv.isumatpf == 4: + elif pfv.i_pf_superconductor == 4: op.ocmmnt( self.outfile, " (ITER Nb3Sn critical surface model, user-defined parameters)", ) - elif pfv.isumatpf == 5: + elif pfv.i_pf_superconductor == 5: op.ocmmnt(self.outfile, " (WST Nb3Sn critical surface model)") - elif pfv.isumatpf == 6: + elif pfv.i_pf_superconductor == 6: op.ocmmnt( self.outfile, " (REBCO 2nd generation HTS superconductor in CrCo strand)", ) - elif pfv.isumatpf == 7: + elif pfv.i_pf_superconductor == 7: op.ocmmnt( self.outfile, " (Durham Ginzburg-Landau critical surface model for Nb-Ti)", ) - elif pfv.isumatpf == 8: + elif pfv.i_pf_superconductor == 8: op.ocmmnt( self.outfile, " (Durham Ginzburg-Landau critical surface model for REBCO)", ) - elif pfv.isumatpf == 9: + elif pfv.i_pf_superconductor == 9: op.ocmmnt( self.outfile, " (Hazelton experimental data + Zhai conceptual model for REBCO)", diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index 2a4c2e5a39..3dd958a0fd 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -788,7 +788,7 @@ { "no": 156, "level": 3, - "message": "SUPERCONPF: Illegal value for isumatpf" + "message": "SUPERCONPF: Illegal value for i_pf_superconductor" }, { "no": 157, diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 7b9dcb3746..5688de428c 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -298,7 +298,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) use pfcoil_variables, only: rhopfbus, rjconpf, zref, fcuohsu, oh_steel_frac, vf, & coheof, sigpfcalw, alstroh, ipfres, fcupfsu, fvssu, etapsu, i_cs_stress, & fbmaxcs, ngc, rpf2, fcohbop, ohhghf, vfohc, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & - ngrp, isumatpf, nfxfh, alfapf, routr, sigpfcf, pfclres, bmaxcs_lim, & + ngrp, i_pf_superconductor, nfxfh, alfapf, routr, sigpfcf, pfclres, bmaxcs_lim, & ncls, nfixmx, cptdin, ipfloc, i_sup_pf_shape, rref, i_pf_current, & ccl0_ma, ccls_ma, ld_ratio_cst use physics_variables, only: ipedestal, taumax, i_single_null, fvsbrnni, & @@ -1858,8 +1858,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('i_cs_superconductor') call parse_int_variable('i_cs_superconductor', i_cs_superconductor, 1, 9, & 'Central Solenoid superconductor material') - case ('isumatpf') - call parse_int_variable('isumatpf', isumatpf, 1, 9, & + case ('i_pf_superconductor') + call parse_int_variable('i_pf_superconductor', i_pf_superconductor, 1, 9, & 'PF coil superconductor material') case ('supercond_cost_model') call parse_int_variable('supercond_cost_model', supercond_cost_model, 0, 1, & diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 8dd4c0c0e6..9470b08eed 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -146,7 +146,7 @@ module pfcoil_variables !! - =8 Durham Ginzburg-Landau critical surface model for REBCO !! - =9 Hazelton experimental data + Zhai conceptual model for REBCO - integer :: isumatpf + integer :: i_pf_superconductor !! switch for superconductor material in PF coils: !! !! - =1 ITER Nb3Sn critical surface model with standard @@ -447,7 +447,7 @@ subroutine init_pfcoil_variables ipfres = 0 itr_sum = 0.0D0 i_cs_superconductor = 1 - isumatpf = 1 + i_pf_superconductor = 1 j_crit_str_cs = 0.0D0 j_crit_str_pf = 0.0D0 i_pf_current = 1 diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index a625872e79..73cb5081d9 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -151,7 +151,7 @@ module tfcoil_variables !! density of coil case (kg/m3) real(dp), dimension(9) :: dcond - !! density of superconductor type given by i_tf_sc_mat/i_cs_superconductor/isumatpf (kg/m3) + !! density of superconductor type given by i_tf_sc_mat/i_cs_superconductor/i_pf_superconductor (kg/m3) real(dp) :: dcondins !! density of conduit + ground-wall insulation (kg/m3) diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 58f572d6d1..3559070e38 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -811,7 +811,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3514E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3378E+02 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -1733,7 +1733,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 ipfloc = 2,2,3,3 * Switch for superconductor material in pf coils -isumatpf = 3 +i_pf_superconductor = 3 * Number of pf coils in group j ncls = 1,1,2,2 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 5f49557c88..dcd9df2c95 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -812,7 +812,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3514E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3378E+02 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -1734,7 +1734,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 ipfloc = 2,2,3,3 * Switch for superconductor material in pf coils -isumatpf = 3 +i_pf_superconductor = 3 * Number of pf coils in group j ncls = 1,1,2,2 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index ddc7c0d15d..ad5f25cf88 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -812,7 +812,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3514E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3378E+02 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -1734,7 +1734,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 ipfloc = 2,2,3,3 * Switch for superconductor material in pf coils -isumatpf = 3 +i_pf_superconductor = 3 * Number of pf coils in group j ncls = 1,1,2,2 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 9aebf957c2..f3c241dece 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -812,7 +812,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3514E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3378E+02 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -1734,7 +1734,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 ipfloc = 2,2,3,3 * Switch for superconductor material in pf coils -isumatpf = 3 +i_pf_superconductor = 3 * Number of pf coils in group j ncls = 1,1,2,2 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index b65112b8c1..17bfd7bc93 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -544,7 +544,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 ipfloc = 2,2,3,3 * Switch for superconductor material in pf coils -isumatpf = 3 +i_pf_superconductor = 3 * Number of pf coils in group j ncls = 1,1,2,2 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 74109c626b..69d7fc86bf 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -815,7 +815,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3812E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3795E+02 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 1.0000E+00 @@ -1735,7 +1735,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 ipfloc = 2,2,3,3 * Switch for superconductor material in pf coils -isumatpf = 3 +i_pf_superconductor = 3 * Number of pf coils in group j ncls = 1,1,2,2 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index c7b15594e4..4aeb69afea 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -285,7 +285,7 @@ fcohbop = 0.93491189654662 * ratio of central solenoid overall current density fcuohsu = 0.70 * copper fraction of strand in central solenoid ipfloc = 2,2,3,3 * Switch for location of PF coil group i; i_cs_superconductor = 1 * switch for superconductor material in central solenoid; -isumatpf = 3 * switch for superconductor material in PF coils; +i_pf_superconductor = 3 * switch for superconductor material in PF coils; ncls = 1,1,2,2 * number of PF coils in group j ngrp = 4 * number of groups of PF coils; Symmetric coil pairs should all be in the same group ohhghf = 0.9 * Central solenoid height / TF coil internal height diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 01749ec9c6..590fbee338 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -227,7 +227,7 @@ coheof = 13540000.0 * Central solenoid overall current density at end of flat- cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at ipfloc = 2,2,3,3 * Switch for locating scheme of pf coil group i; -isumatpf = 3 * Switch for superconductor material in pf coils; +i_pf_superconductor = 3 * Switch for superconductor material in pf coils; ncls = 1,1,2,2, * Number of pf coils in group j ngrp = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 46098ed6de..73282538e3 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -813,7 +813,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9098E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -1976,7 +1976,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9481E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -3139,7 +3139,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9725E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -4302,7 +4302,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9779E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -5465,7 +5465,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9371E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -6628,7 +6628,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.8979E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -7791,7 +7791,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9001E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -8954,7 +8954,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9224E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -10117,7 +10117,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9457E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -11280,7 +11280,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9479E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -12443,7 +12443,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9294E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -13606,7 +13606,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9232E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -14769,7 +14769,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9265E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -15932,7 +15932,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9428E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -17095,7 +17095,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 4.9612E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 0.0000E+00 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -18021,7 +18021,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 ipfloc = 2,2,3,3 * Switch for superconductor material in pf coils -isumatpf = 3 +i_pf_superconductor = 3 * Number of pf coils in group j ncls = 1,1,2,2 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 90d8213f43..8752ecee8d 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -648,7 +648,7 @@ Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -1643,7 +1643,7 @@ Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -2638,7 +2638,7 @@ Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -3633,7 +3633,7 @@ Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -4628,7 +4628,7 @@ Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -5623,7 +5623,7 @@ Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -6618,7 +6618,7 @@ Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -7613,7 +7613,7 @@ Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -8608,7 +8608,7 @@ Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 @@ -9206,7 +9206,7 @@ coheof = 13540000.0 * Central solenoid overall current density at end of flat- cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at ipfloc = 2,2,3,3 * Switch for locating scheme of pf coil group i; -isumatpf = 3 * Switch for superconductor material in pf coils; +i_pf_superconductor = 3 * Switch for superconductor material in pf coils; ncls = 1,1,2,2, * Number of pf coils in group j ngrp = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 6372fdce93..ea7379312b 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -227,7 +227,7 @@ coheof = 13540000.0 * Central solenoid overall current density at end of flat- cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at ipfloc = 2,2,3,3 * Switch for locating scheme of pf coil group i; -isumatpf = 3 * Switch for superconductor material in pf coils; +i_pf_superconductor = 3 * Switch for superconductor material in pf coils; ncls = 1,1,2,2, * Number of pf coils in group j ngrp = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index 909822b4d7..ac69233e21 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -227,7 +227,7 @@ coheof = 13540000.0 * Central solenoid overall current density at end of flat- cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at ipfloc = 2,2,3,3 * Switch for locating scheme of pf coil group i; -isumatpf = 3 * Switch for superconductor material in pf coils; +i_pf_superconductor = 3 * Switch for superconductor material in pf coils; ncls = 1,1,2,2, * Number of pf coils in group j ngrp = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index ee31555873..5e5798e716 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2673,7 +2673,7 @@ "isthtr": 3.0, "istore": 1.0, "i_cs_superconductor": 1.0, - "isumatpf": 1.0, + "i_pf_superconductor": 1.0, "isweep": 0.0, "isweep_2": 0.0, "itart": 0.0, @@ -9258,7 +9258,7 @@ "dcdrv0": "IFE generic/laser driver cost gradient (M$/MJ)", "dcdrv1": "HIB driver cost gradient at low energy (M$/MJ)", "dcdrv2": "HIB driver cost gradient at high energy (M$/MJ)", - "dcond": "density of superconductor type given by i_tf_sc_mat/i_cs_superconductor/isumatpf (kg/m3)", + "dcond": "density of superconductor type given by i_tf_sc_mat/i_cs_superconductor/i_pf_superconductor (kg/m3)", "dcondins": "density of conduit + ground-wall insulation (kg/m3)", "dcopper": "density of copper (kg/m3)", "dr_cryostat": "cryostat thickness (m)", @@ -9910,7 +9910,7 @@ "isthtr": "Switch for stellarator auxiliary heating method:\n
    \n
  • = 1electron cyclotron resonance heating
    • \n
  • = 2lower hybrid heating
    • \n
  • = 3neutral beam injection
    • \n
", "istore": "Switch for thermal storage method:\n
    \n
  • =1 option 1 of Electrowatt report, AEA FUS 205
    • \n
  • =2 option 2 of Electrowatt report, AEA FUS 205
    • \n
  • =3 stainless steel block
    • \n
", "i_cs_superconductor": "switch for superconductor material in central solenoid:\n
    \n
  • =1 ITER Nb3Sn critical surface model with standard\n ITER parameters
    • \n
  • =2 Bi-2212 high temperature superconductor (range of\n validity T < 20K, adjusted field b < 104 T, B > 6 T)
    • \n
  • =3 NbTi
    • \n
  • =4 ITER Nb3Sn model with user-specified parameters
    • \n
  • =5 WST Nb3Sn parameterisation
    • \n
  • =6 REBCO HTS parameterisation
    • \n
", - "isumatpf": "switch for superconductor material in PF coils:\n
    \n
  • =1 ITER Nb3Sn critical surface model with standard\n ITER parameters
    • \n
  • =2 Bi-2212 high temperature superconductor (range of\n validity T < 20K, adjusted field b < 104 T, B > 6 T)
    • \n
  • =3 NbTi
    • \n
  • =4 ITER Nb3Sn model with user-specified parameters
    • \n
  • =5 WST Nb3Sn parameterisation
    • \n
", + "i_pf_superconductor": "switch for superconductor material in PF coils:\n
    \n
  • =1 ITER Nb3Sn critical surface model with standard\n ITER parameters
    • \n
  • =2 Bi-2212 high temperature superconductor (range of\n validity T < 20K, adjusted field b < 104 T, B > 6 T)
    • \n
  • =3 NbTi
    • \n
  • =4 ITER Nb3Sn model with user-specified parameters
    • \n
  • =5 WST Nb3Sn parameterisation
    • \n
", "isweep": "Number of scan points to calculate", "isweep_2": "Number of 2D scan points to calculate", "itart": "switch for spherical tokamak (ST) models:\n
    \n
  • =0 use conventional aspect ratio models
    • \n
  • =1 use spherical tokamak models
    • \n
", @@ -13509,7 +13509,7 @@ "lb": 1, "ub": 8 }, - "isumatpf": { + "i_pf_superconductor": { "lb": 1, "ub": 8 }, @@ -18952,7 +18952,7 @@ "ipfres", "itr_sum", "i_cs_superconductor", - "isumatpf", + "i_pf_superconductor", "i_pf_current", "i_sup_pf_shape", "jscoh_bop", @@ -20492,7 +20492,7 @@ "isthtr": "int_variable", "istore": "int_variable", "i_cs_superconductor": "int_variable", - "isumatpf": "int_variable", + "i_pf_superconductor": "int_variable", "isweep": "int_variable", "isweep_2": "int_variable", "itart": "int_variable", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 97aa6d7c84..e2a1c9c326 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -103,7 +103,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "fcohbof", 2.654e-1) monkeypatch.setattr(pfv, "ra", np.full(22, 0.0)) monkeypatch.setattr(pfv, "rb", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "isumatpf", 3) + monkeypatch.setattr(pfv, "i_pf_superconductor", 3) monkeypatch.setattr(pfv, "i_cs_superconductor", 1) monkeypatch.setattr(pfv, "whtpf", 0.0) monkeypatch.setattr(pfv, "fcupfsu", 6.900e-1) diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 59fc787c33..112e126a02 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -544,7 +544,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 ipfloc = 2,2,3,3 * Switch for superconductor material in pf coils -isumatpf = 3 +i_pf_superconductor = 3 * Number of pf coils in group j ncls = 1,1,2,2 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 45719c2e0f..eeced85543 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -526,7 +526,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 ipfloc = 2,2,3,3 * Switch for superconductor material in pf coils -isumatpf = 3 +i_pf_superconductor = 3 * Number of pf coils in group j ncls = 1,1,2,2 diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index 2b35f0349c..c51bf2ce1c 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -285,7 +285,7 @@ fcohbop = 0.93491189654662 * ratio of central solenoid overall current density fcuohsu = 0.70 * copper fraction of strand in central solenoid ipfloc = 2,2,3,3 * Switch for location of PF coil group i; i_cs_superconductor = 1 * switch for superconductor material in central solenoid; -isumatpf = 3 * switch for superconductor material in PF coils; +i_pf_superconductor = 3 * switch for superconductor material in PF coils; ncls = 1,1,2,2 * number of PF coils in group j ngrp = 4 * number of groups of PF coils; Symmetric coil pairs should all be in the same group ohhghf = 0.9 * Central solenoid height / TF coil internal height diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 7f4fff3cf9..2b04448120 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -950,7 +950,7 @@ i_tf_sc_mat = 9 * JUSTIFICATION: Not used as not i_tf_sc_mat=4 *dcond = -* DESCRIPTION: Density of superconductor type given by i_tf_sc_mat/i_cs_superconductor/isumatpf (kg/m3) +* DESCRIPTION: Density of superconductor type given by i_tf_sc_mat/i_cs_superconductor/i_pf_superconductor (kg/m3) * JUSTIFICATION: Not set, assuming default *quench_model = @@ -1824,7 +1824,7 @@ ipfres = 0 * Conductor Type * *----------------* -isumatpf = 9 +i_pf_superconductor = 9 * DESCRIPTION: Switch for Superconductor Material in PF Coils (9: REBCO) * =1 ITER Nb3Sn critical surface model with standard * ITER parameters diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 128ac168ef..f3150c38bf 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -545,7 +545,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 ipfloc = 2,2,3,3 * Switch for superconductor material in pf coils -isumatpf = 3 +i_pf_superconductor = 3 * Number of pf coils in group j ncls = 1,1,2,2 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index b85652049f..34b445f5a0 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -815,7 +815,7 @@ CS_structural_radial_thickness_(m)______________________________________ (t_structural_radial)_________ 5.3812E-03 Allowable_number_of_cycles_till_CS_fracture_____________________________ (n_cycle)_____________________ 1.3795E+02 OP Minimum_number_of_cycles_required_till_CS_fracture______________________ (n_cycle_min)_________________ 2.0000E+04 OP - PF_coil_superconductor_material_________________________________________ (isumatpf)____________________ 3 + PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 1.0000E+00 @@ -1736,7 +1736,7 @@ cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 ipfloc = 2,2,3,3 * Switch for superconductor material in pf coils -isumatpf = 3 +i_pf_superconductor = 3 * Number of pf coils in group j ncls = 1,1,2,2 diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 19a4f02b8f..78bab4fc5e 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -2034,7 +2034,7 @@ class Acc2222Param(NamedTuple): turns: Any = None - isumatpf: Any = None + i_pf_superconductor: Any = None whtpfs: Any = None @@ -2162,7 +2162,7 @@ class Acc2222Param(NamedTuple): ), order="F", ).transpose(), - isumatpf=3, + i_pf_superconductor=3, whtpfs=2695737.563343476, ric=np.array( np.array( @@ -2358,7 +2358,7 @@ class Acc2222Param(NamedTuple): ), order="F", ).transpose(), - isumatpf=3, + i_pf_superconductor=3, whtpfs=2510424.9065680322, ric=np.array( np.array( @@ -2554,7 +2554,7 @@ class Acc2222Param(NamedTuple): ), order="F", ).transpose(), - isumatpf=3, + i_pf_superconductor=3, whtpfs=2510424.9065680322, ric=np.array( np.array( @@ -2723,7 +2723,9 @@ def test_acc2222(acc2222param, monkeypatch, costs): monkeypatch.setattr(pfcoil_variables, "turns", acc2222param.turns) - monkeypatch.setattr(pfcoil_variables, "isumatpf", acc2222param.isumatpf) + monkeypatch.setattr( + pfcoil_variables, "i_pf_superconductor", acc2222param.i_pf_superconductor + ) monkeypatch.setattr(pfcoil_variables, "whtpfs", acc2222param.whtpfs) From add979a49f96d3421da0a063fe87cf6cd3266076 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 11:42:02 +0000 Subject: [PATCH 04/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'ipfloc'=20to=20'?= =?UTF-8?q?i=5Fpf=5Flocation'=20across=20multiple=20files=20for=20consiste?= =?UTF-8?q?ncy=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/central-solenoid.md | 2 +- .../proc-pages/eng-models/pf-coil.md | 12 +++---- .../proc-pages/io/python-lib-guide.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 4 +-- examples/data/large_tokamak_1_MFILE.DAT | 4 +-- examples/data/large_tokamak_2_MFILE.DAT | 4 +-- examples/data/large_tokamak_3_MFILE.DAT | 4 +-- examples/data/large_tokamak_4_MFILE.DAT | 4 +-- examples/data/large_tokamak_IN.DAT | 4 +-- examples/data/scan_MFILE.DAT | 4 +-- examples/data/scan_example_file_IN.DAT | 4 +-- process/init.py | 18 +++++------ process/pfcoil.py | 32 +++++++++---------- process/utilities/errorlist.json | 16 +++++----- source/fortran/input.f90 | 6 ++-- source/fortran/pfcoil_variables.f90 | 28 ++++++++-------- .../data/large_tokamak_1_MFILE.DAT | 4 +-- .../data/large_tokamak_2_MFILE.DAT | 4 +-- .../data/large_tokamak_3_MFILE.DAT | 4 +-- .../data/large_tokamak_4_MFILE.DAT | 4 +-- tests/integration/data/large_tokamak_IN.DAT | 4 +-- .../integration/data/large_tokamak_MFILE.DAT | 4 +-- .../data/large_tokamak_once_through.IN.DAT | 4 +-- tests/integration/data/ref_IN.DAT | 4 +-- tests/integration/data/scan_2D_MFILE.DAT | 4 +-- tests/integration/data/scan_MFILE.DAT | 4 +-- .../data/uncertainties_nonopt_ref_IN.DAT | 4 +-- .../integration/data/uncertainties_ref_IN.DAT | 4 +-- tests/integration/ref_dicts.json | 20 ++++++------ tests/integration/test_pfcoil_int.py | 2 +- .../input_files/large_tokamak.IN.DAT | 4 +-- .../input_files/large_tokamak_nof.IN.DAT | 4 +-- .../large_tokamak_once_through.IN.DAT | 4 +-- .../input_files/st_regression.IN.DAT | 26 +++++++-------- tests/unit/data/large_tokamak_IN.DAT | 4 +-- tests/unit/data/large_tokamak_MFILE.DAT | 4 +-- 36 files changed, 132 insertions(+), 132 deletions(-) diff --git a/documentation/proc-pages/eng-models/central-solenoid.md b/documentation/proc-pages/eng-models/central-solenoid.md index eb6996a739..f964616903 100644 --- a/documentation/proc-pages/eng-models/central-solenoid.md +++ b/documentation/proc-pages/eng-models/central-solenoid.md @@ -9,7 +9,7 @@ amount actually available. The code measures the magnetic flux in units of Volt. Switch `iohcl` controls whether a central solenoid is present. A value of 1 denotes that this coil is present, and should be assigned a non-zero thickness `dr_cs`. A value of `iohcl` = 0 denotes that no central solenoid is present, in which case the thickness `dr_cs` should be zero. No PF -coils should be located at positions defined by `ipfloc(j)` = 1 if no central solenoid is present. +coils should be located at positions defined by `i_pf_location(j)` = 1 if no central solenoid is present. The central solenoid can be either resistive or superconducting (controlled via switch `ipfres` as for the other PF coils), and if superconducting, switch `i_pf_superconductor` determines the superconducting diff --git a/documentation/proc-pages/eng-models/pf-coil.md b/documentation/proc-pages/eng-models/pf-coil.md index 2d0788abb2..7938587792 100644 --- a/documentation/proc-pages/eng-models/pf-coil.md +++ b/documentation/proc-pages/eng-models/pf-coil.md @@ -9,10 +9,10 @@ position and shape during the flat-top period. The positions and sizes of te PF coils are partly input, and partly calculated after consideration of the required currents and allowable current density. -The PF coil locations are controlled using a set of switched stored in array `ipfloc` (see +The PF coil locations are controlled using a set of switched stored in array `i_pf_location` (see Figure 1), and are calculated in routine `PFCOIL`. The coils are (usually) organised into groups containing two PF coils placed symmetrically above and below the midplane, and each group `j` has -an element `ipfloc(j)` assigned to it. Input parameter `ngrp` should be set to the number of groups, +an element `i_pf_location(j)` assigned to it. Input parameter `ngrp` should be set to the number of groups, and `ncls(j)` should be assigned the number of coils in each group - which should be 2 in each case.
@@ -24,18 +24,18 @@ In the following, all variables are defined in the variable descriptor file `var values for `rpf1`, `rpf2`, `zref(j)` and `routr` should be adjusted by the user to locate the PF coils accurately. -The three possible values of `ipfloc(j)` correspond to the following PF coil positions: (Redo taking +The three possible values of `i_pf_location(j)` correspond to the following PF coil positions: (Redo taking into account `i_single_null` and other recent changes e.g. rclsnorm) -`ipfloc(j)` = 1: PF coils are placed above the central solenoid (one group only); +`i_pf_location(j)` = 1: PF coils are placed above the central solenoid (one group only); *R* = `rohc` + `rpf1`
*Z* = $\pm$(`hmax` * `ohhghf` + 0.1 + 0.5 * (`hmax` * (1 - `ohhghf`) + `dr_tf_inboard` + 0.1)) -`ipfloc(j)` = 2: PF coils are placed above the TF coils (one group only);
+`i_pf_location(j)` = 2: PF coils are placed above the TF coils (one group only);
*R* = `rmajor` + `rpf2`
*Z* = $\pm$(`hmax` * `dr_tf_inboard` + 0.86) -`ipfloc(j)` = 3: PF coils are placed radially outside the TF coils (any number of groups);
+`i_pf_location(j)` = 3: PF coils are placed radially outside the TF coils (any number of groups);
*R* = `rtot` + `dr_tf_outboard`/2 + `routr`
*Z* = $\pm$(`rminor` * `zref(j)` diff --git a/documentation/proc-pages/io/python-lib-guide.md b/documentation/proc-pages/io/python-lib-guide.md index 5582ddff8d..c6c1ba9530 100644 --- a/documentation/proc-pages/io/python-lib-guide.md +++ b/documentation/proc-pages/io/python-lib-guide.md @@ -26,7 +26,7 @@ To get values of input file entries from the object i.number_of_constraints i.number_of_itvars i.data["fimp"].value - i.data["ipfloc"].value + i.data["i_pf_location"].value ``` To add/remove constraints, iteration variables diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 5a577287ca..d0b40ad621 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -1737,7 +1737,7 @@ iavail = 0 cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i -ipfloc = 2,2,3,3 +i_pf_location = 2,2,3,3 * Switch for superconductor material in pf coils i_pf_superconductor = 3 @@ -1754,7 +1754,7 @@ ohhghf = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 -* Offset of radial position of ipfloc=2 pf coils [m] +* Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 zref(1) = 3.6 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 296a1573fb..335705eeb4 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -1731,7 +1731,7 @@ iavail = 0 cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i -ipfloc = 2,2,3,3 +i_pf_location = 2,2,3,3 * Switch for superconductor material in pf coils i_pf_superconductor = 3 @@ -1748,7 +1748,7 @@ ohhghf = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 -* Offset of radial position of ipfloc=2 pf coils [m] +* Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 zref(1) = 3.6 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index c1ce22aa09..f94b9d0c4d 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -1731,7 +1731,7 @@ iavail = 0 cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i -ipfloc = 2,2,3,3 +i_pf_location = 2,2,3,3 * Switch for superconductor material in pf coils i_pf_superconductor = 3 @@ -1748,7 +1748,7 @@ ohhghf = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 -* Offset of radial position of ipfloc=2 pf coils [m] +* Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 zref(1) = 3.6 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index f372dcde3d..8691452642 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -1732,7 +1732,7 @@ iavail = 0 cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i -ipfloc = 2,2,3,3 +i_pf_location = 2,2,3,3 * Switch for superconductor material in pf coils i_pf_superconductor = 3 @@ -1749,7 +1749,7 @@ ohhghf = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 -* Offset of radial position of ipfloc=2 pf coils [m] +* Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 zref(1) = 3.6 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 9e04525ebe..68bf0da713 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -1732,7 +1732,7 @@ iavail = 0 cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i -ipfloc = 2,2,3,3 +i_pf_location = 2,2,3,3 * Switch for superconductor material in pf coils i_pf_superconductor = 3 @@ -1749,7 +1749,7 @@ ohhghf = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 -* Offset of radial position of ipfloc=2 pf coils [m] +* Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 zref(1) = 3.6 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 0cf2aa777f..b44197d607 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -542,7 +542,7 @@ iavail = 0 cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i -ipfloc = 2,2,3,3 +i_pf_location = 2,2,3,3 * Switch for superconductor material in pf coils i_pf_superconductor = 3 @@ -559,7 +559,7 @@ ohhghf = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 -* Offset of radial position of ipfloc=2 pf coils [m] +* Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 zref(1) = 3.6 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 5ba6c6fdba..1737909d5f 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -9205,13 +9205,13 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon coheof = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at -ipfloc = 2,2,3,3 * Switch for locating scheme of pf coil group i; +i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; ncls = 1,1,2,2, * Number of pf coils in group j ngrp = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) -rpf2 = -1.825 * Offset (m) of radial position of ipfloc=2 pf coils +rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils zref(1) = 3.6 zref(2) = 1.2 diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index fe3787bb1f..7d6d6f465a 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -542,7 +542,7 @@ iavail = 0 cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i -ipfloc = 2,2,3,3 +i_pf_location = 2,2,3,3 * Switch for superconductor material in pf coils i_pf_superconductor = 3 @@ -559,7 +559,7 @@ ohhghf = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 -* Offset of radial position of ipfloc=2 pf coils [m] +* Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 zref(1) = 3.6 diff --git a/process/init.py b/process/init.py index 3688ab874d..77c47dcb95 100644 --- a/process/init.py +++ b/process/init.py @@ -689,9 +689,9 @@ def check_process(): # 2 : PF coil on top of TF coil # 3 : PF coil outside of TF coil if fortran.physics_variables.itartpf == 0: - fortran.pfcoil_variables.ipfloc[0] = 2 - fortran.pfcoil_variables.ipfloc[1] = 3 - fortran.pfcoil_variables.ipfloc[2] = 3 + fortran.pfcoil_variables.i_pf_location[0] = 2 + fortran.pfcoil_variables.i_pf_location[1] = 3 + fortran.pfcoil_variables.i_pf_location[2] = 3 # Water cooled copper magnets initalisation / checks if fortran.tfcoil_variables.i_tf_sup == 0: @@ -823,28 +823,28 @@ def check_process(): k = 0 for i in range(fortran.pfcoil_variables.ngrp): if ( - fortran.pfcoil_variables.ipfloc[i] != 2 + fortran.pfcoil_variables.i_pf_location[i] != 2 and fortran.pfcoil_variables.ncls[i] != 2 ): raise ProcessValidationError( - "ncls(i) .ne. 2 is not a valid option except for (ipfloc = 2)" + "ncls(i) .ne. 2 is not a valid option except for (i_pf_location = 2)" ) - if fortran.pfcoil_variables.ipfloc[i] == 2: + if fortran.pfcoil_variables.i_pf_location[i] == 2: j = j + 1 k = k + fortran.pfcoil_variables.ncls[i] if k == 1: raise ProcessValidationError( - "Only 1 divertor coil (ipfloc = 2) is not a valid configuration" + "Only 1 divertor coil (i_pf_location = 2) is not a valid configuration" ) if k > 2: raise ProcessValidationError( - "More than 2 divertor coils (ipfloc = 2) is not a valid configuration" + "More than 2 divertor coils (i_pf_location = 2) is not a valid configuration" ) if fortran.physics_variables.i_single_null == 1 and j < 2: raise ProcessValidationError( - "If i_single_null=1, use 2 individual divertor coils (ipfloc = 2, 2; ncls = 1, 1)" + "If i_single_null=1, use 2 individual divertor coils (i_pf_location = 2, 2; ncls = 1, 1)" ) # Constraint 10 is dedicated to ST designs with demountable joints diff --git a/process/pfcoil.py b/process/pfcoil.py index 3ce498a24f..1e92c388c8 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -83,7 +83,7 @@ def pfcoil(self): signn = np.zeros(2) aturn = np.zeros(pfv.ngc2) - # Toggle switch for ipfloc()=2 coils above/below midplane + # Toggle switch for i_pf_location()=2 coils above/below midplane top_bottom = 1 # Set up the number of PF coils including the Central Solenoid (nohc), @@ -165,7 +165,7 @@ def pfcoil(self): # N.B. Problems here if k=ncls(group) is greater than 2. for j in range(pfv.ngrp): - if pfv.ipfloc[j] == 1: + if pfv.i_pf_location[j] == 1: # PF coil is stacked on top of the Central Solenoid for k in range(pfv.ncls[j]): pf.rcls[j, k] = pfv.rohc + pfv.rpf1 @@ -179,7 +179,7 @@ def pfcoil(self): * (bv.hmax * (1.0e0 - pfv.ohhghf) + bv.dr_tf_inboard + 0.1e0) ) - elif pfv.ipfloc[j] == 2: + elif pfv.i_pf_location[j] == 2: # PF coil is on top of the TF coil for k in range(pfv.ncls[j]): pf.rcls[j, k] = pv.rmajor + pfv.rpf2 * pv.triang * pv.rminor @@ -196,7 +196,7 @@ def pfcoil(self): ) top_bottom = 1 - elif pfv.ipfloc[j] == 3: + elif pfv.i_pf_location[j] == 3: # PF coil is radially outside the TF coil for k in range(pfv.ncls[j]): pf.zcls[j, k] = pv.rminor * pfv.zref[j] * signn[k] @@ -214,7 +214,7 @@ def pfcoil(self): ) pf.rcls[j, k] = 1e10 - elif pfv.ipfloc[j] == 4: + elif pfv.i_pf_location[j] == 4: # PF coil is in general location # See issue 1418 # https://git.ccfe.ac.uk/process/process/-/issues/1418 @@ -224,7 +224,7 @@ def pfcoil(self): else: eh.idiags[0] = j - eh.idiags[1] = pfv.ipfloc[j] + eh.idiags[1] = pfv.i_pf_location[j] eh.report_error(67) # Allocate current to the PF coils: @@ -282,23 +282,23 @@ def pfcoil(self): # Bypasses SVD solver if pv.itart == 1 and pv.itartpf == 0: for i in range(pfv.ngrp): - if pfv.ipfloc[i] == 1: + if pfv.i_pf_location[i] == 1: # PF coil is stacked on top of the Central Solenoid pf.ccls[i] = 0.0e0 eh.idiags[0] = i eh.report_error(69) - elif pfv.ipfloc[i] == 2: + elif pfv.i_pf_location[i] == 2: # PF coil is on top of the TF coil pf.ccls[i] = 0.3e0 * pv.aspect**1.6e0 * pv.plasma_current - elif pfv.ipfloc[i] == 3: + elif pfv.i_pf_location[i] == 3: # PF coil is radially outside the TF coil pf.ccls[i] = -0.4e0 * pv.plasma_current else: eh.idiags[0] = i - eh.idiags[1] = pfv.ipfloc[i] + eh.idiags[1] = pfv.i_pf_location[i] eh.report_error(70) # Vertical field (T) @@ -320,7 +320,7 @@ def pfcoil(self): ngrp0 = 0 nocoil = 0 for i in range(pfv.ngrp): - if pfv.ipfloc[i] == 1: + if pfv.i_pf_location[i] == 1: # Do not allow if no central solenoid if bv.iohcl == 0: eh.report_error(288) @@ -335,7 +335,7 @@ def pfcoil(self): pf.cfxf[nocoil] = pf.ccls[i] nocoil = nocoil + 1 - elif pfv.ipfloc[i] == 2: + elif pfv.i_pf_location[i] == 2: # PF coil is on top of the TF coil; divertor coil # This is a fixed current for this calculation -- RK 07/12 @@ -351,14 +351,14 @@ def pfcoil(self): pf.cfxf[nocoil] = pf.ccls[i] nocoil = nocoil + 1 - elif pfv.ipfloc[i] == 3: + elif pfv.i_pf_location[i] == 3: # PF coil is radially outside the TF coil # This is an equilibrium coil, current must be solved for pcls0[ngrp0] = i + 1 ngrp0 = ngrp0 + 1 - elif pfv.ipfloc[i] == 4: + elif pfv.i_pf_location[i] == 4: # PF coil is generally placed # See issue 1418 # https://git.ccfe.ac.uk/process/process/-/issues/1418 @@ -369,7 +369,7 @@ def pfcoil(self): else: eh.idiags[0] = i - eh.idiags[1] = pfv.ipfloc[i] + eh.idiags[1] = pfv.i_pf_location[i] eh.report_error(70) for ccount in range(ngrp0): @@ -530,7 +530,7 @@ def pfcoil(self): for ii in range(pfv.ngrp): for _ij in range(pfv.ncls[ii]): - if pfv.ipfloc[ii] == 1: + if pfv.i_pf_location[ii] == 1: # PF coil is stacked on top of the Central Solenoid dx = 0.5e0 * bv.dr_cs dz = 0.5e0 * ( diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index 3dd958a0fd..94ce0c86f8 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -213,22 +213,22 @@ { "no": 41, "level": 3, - "message": "CHECK: ncls(i) .ne. 2 is not a valid option except for (ipfloc = 2)" + "message": "CHECK: ncls(i) .ne. 2 is not a valid option except for (i_pf_location = 2)" }, { "no": 42, "level": 3, - "message": "CHECK: Only 1 divertor coil (ipfloc = 2) is not a valid configuration" + "message": "CHECK: Only 1 divertor coil (i_pf_location = 2) is not a valid configuration" }, { "no": 43, "level": 3, - "message": "CHECK: More than 2 divertor coils (ipfloc = 2) is not a valid configuration" + "message": "CHECK: More than 2 divertor coils (i_pf_location = 2) is not a valid configuration" }, { "no": 44, "level": 3, - "message": "CHECK: If i_single_null=1, use 2 individual divertor coils (ipfloc = 2, 2; ncls = 1, 1)" + "message": "CHECK: If i_single_null=1, use 2 individual divertor coils (i_pf_location = 2, 2; ncls = 1, 1)" }, { "no": 45, @@ -343,7 +343,7 @@ { "no": 67, "level": 3, - "message": "PFCOIL: Illegal ipfloc value" + "message": "PFCOIL: Illegal i_pf_location value" }, { "no": 68, @@ -353,12 +353,12 @@ { "no": 69, "level": 3, - "message": "PFCOIL: ipfloc(i) should not be 1 if itart=1" + "message": "PFCOIL: i_pf_location(i) should not be 1 if itart=1" }, { "no": 70, "level": 3, - "message": "PFCOIL: Illegal value of ipfloc(i)" + "message": "PFCOIL: Illegal value of i_pf_location(i)" }, { "no": 71, @@ -1448,7 +1448,7 @@ { "no": 288, "level": 3, - "message": "PFCOIL: ipfloc(i) should not be 1 if iohcl=0" + "message": "PFCOIL: i_pf_location(i) should not be 1 if iohcl=0" } ] } diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 5688de428c..a7be97017b 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -299,7 +299,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) coheof, sigpfcalw, alstroh, ipfres, fcupfsu, fvssu, etapsu, i_cs_stress, & fbmaxcs, ngc, rpf2, fcohbop, ohhghf, vfohc, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & ngrp, i_pf_superconductor, nfxfh, alfapf, routr, sigpfcf, pfclres, bmaxcs_lim, & - ncls, nfixmx, cptdin, ipfloc, i_sup_pf_shape, rref, i_pf_current, & + ncls, nfixmx, cptdin, i_pf_location, i_sup_pf_shape, rref, i_pf_current, & ccl0_ma, ccls_ma, ld_ratio_cst use physics_variables, only: ipedestal, taumax, i_single_null, fvsbrnni, & rhopedt, f_vol_plasma, f_deuterium, ffwal, i_beta_component, itartpf, i_l_h_threshold, & @@ -1849,8 +1849,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('fcupfsu') call parse_real_variable('fcupfsu', fcupfsu, 0.0D0, 1.0D0, & 'Cu fraction of PF cable conductor') - case ('ipfloc') - call parse_int_array('ipfloc', ipfloc, isub1, n_pf_groups_max, & + case ('i_pf_location') + call parse_int_array('i_pf_location', i_pf_location, isub1, n_pf_groups_max, & 'PF coil location', icode) case ('ipfres') call parse_int_variable('ipfres', ipfres, 0, 1, & diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 9470b08eed..fe12e0914d 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -114,7 +114,7 @@ module pfcoil_variables real(dp) :: fvssu !! F-value for `constraint equation 51` - integer, dimension(n_pf_groups_max) :: ipfloc + integer, dimension(n_pf_groups_max) :: i_pf_location !! Switch for location of PF coil group i: !! !! - =1 PF coil on top of central solenoid (flux ramp only) @@ -260,7 +260,7 @@ module pfcoil_variables real(dp), dimension(ngc2) :: rjconpf !! average winding pack current density of PF coil i (A/m2) at time of peak - !! current in that coil (calculated for `ipfloc=1` coils) + !! current in that coil (calculated for `i_pf_location=1` coils) real(dp) :: rjohc !! allowable central solenoid current density at end of flat-top (A/m2) @@ -275,26 +275,26 @@ module pfcoil_variables !! radius to the centre of the central solenoid (m) real(dp) :: routr - !! radial distance (m) from outboard TF coil leg to centre of `ipfloc=3` PF coils + !! radial distance (m) from outboard TF coil leg to centre of `i_pf_location=3` PF coils real(dp), dimension(ngc2) :: rpf !! radius of PF coil i (m) real(dp) :: rpf1 - !! offset (m) of radial position of `ipfloc=1` PF coils from being directly above + !! offset (m) of radial position of `i_pf_location=1` PF coils from being directly above !! the central solenoid real(dp) :: rpf2 - !! offset (m) of radial position of `ipfloc=2` PF coils from being at + !! offset (m) of radial position of `i_pf_location=2` PF coils from being at !! rmajor (offset = rpf2*triang*rminor) real(dp), dimension(n_pf_groups_max) :: rref !! PF coil radial positioning adjuster: !! - !! - for groups j with ipfloc(j) = 1; rref(j) is ignored - !! - for groups j with ipfloc(j) = 2; rref(j) is ignored - !! - for groups j with ipfloc(j) = 3; rref(j) is ignored - !! - for groups j with ipfloc(j) = 4; rref(j) is radius of + !! - for groups j with i_pf_location(j) = 1; rref(j) is ignored + !! - for groups j with i_pf_location(j) = 2; rref(j) is ignored + !! - for groups j with i_pf_location(j) = 3; rref(j) is ignored + !! - for groups j with i_pf_location(j) = 4; rref(j) is radius of !! the coil in units of minor radii from the major radius !! (r = rmajor + rref*rminor) @@ -377,14 +377,14 @@ module pfcoil_variables real(dp), dimension(n_pf_groups_max) :: zref !! PF coil vertical positioning adjuster: !! - !! - for groups j with ipfloc(j) = 1; zref(j) is ignored - !! - for groups j with ipfloc(j) = 2 AND itart=1 (only); + !! - for groups j with i_pf_location(j) = 1; zref(j) is ignored + !! - for groups j with i_pf_location(j) = 2 AND itart=1 (only); !! zref(j) is distance of centre of PF coil from inside !! edge of TF coil (remember that PF coils for STs lie !! within the TF coil) - !! - for groups j with ipfloc(j) = 3; zref(j) = ratio of + !! - for groups j with i_pf_location(j) = 3; zref(j) = ratio of !! height of coil group j to plasma minor radius - !! - for groups j with ipfloc(j) = 4; zref(j) = ratio of + !! - for groups j with i_pf_location(j) = 4; zref(j) = ratio of !! height of coil group j to plasma minor radius real(dp) :: bmaxcs_lim @@ -443,7 +443,7 @@ subroutine init_pfcoil_variables fcuohsu = 0.7D0 fcupfsu = 0.69D0 fvssu = 1.0 - ipfloc = (/2,2,3,0,0,0,0,0,0,0/) + i_pf_location = (/2,2,3,0,0,0,0,0,0,0/) ipfres = 0 itr_sum = 0.0D0 i_cs_superconductor = 1 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 3559070e38..32b039f03d 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -1730,7 +1730,7 @@ iavail = 0 cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i -ipfloc = 2,2,3,3 +i_pf_location = 2,2,3,3 * Switch for superconductor material in pf coils i_pf_superconductor = 3 @@ -1747,7 +1747,7 @@ ohhghf = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 -* Offset of radial position of ipfloc=2 pf coils [m] +* Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 zref(1) = 3.6 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index dcd9df2c95..5642bd42a5 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -1731,7 +1731,7 @@ iavail = 0 cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i -ipfloc = 2,2,3,3 +i_pf_location = 2,2,3,3 * Switch for superconductor material in pf coils i_pf_superconductor = 3 @@ -1748,7 +1748,7 @@ ohhghf = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 -* Offset of radial position of ipfloc=2 pf coils [m] +* Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 zref(1) = 3.6 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index ad5f25cf88..4cee716c2d 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -1731,7 +1731,7 @@ iavail = 0 cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i -ipfloc = 2,2,3,3 +i_pf_location = 2,2,3,3 * Switch for superconductor material in pf coils i_pf_superconductor = 3 @@ -1748,7 +1748,7 @@ ohhghf = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 -* Offset of radial position of ipfloc=2 pf coils [m] +* Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 zref(1) = 3.6 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index f3c241dece..9dbde6b835 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -1731,7 +1731,7 @@ iavail = 0 cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i -ipfloc = 2,2,3,3 +i_pf_location = 2,2,3,3 * Switch for superconductor material in pf coils i_pf_superconductor = 3 @@ -1748,7 +1748,7 @@ ohhghf = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 -* Offset of radial position of ipfloc=2 pf coils [m] +* Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 zref(1) = 3.6 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 17bfd7bc93..b5f1c6f7ef 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -541,7 +541,7 @@ iavail = 0 cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i -ipfloc = 2,2,3,3 +i_pf_location = 2,2,3,3 * Switch for superconductor material in pf coils i_pf_superconductor = 3 @@ -558,7 +558,7 @@ ohhghf = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 -* Offset of radial position of ipfloc=2 pf coils [m] +* Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 zref(1) = 3.6 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 69d7fc86bf..0361e4f5e7 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -1732,7 +1732,7 @@ iavail = 0 cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i -ipfloc = 2,2,3,3 +i_pf_location = 2,2,3,3 * Switch for superconductor material in pf coils i_pf_superconductor = 3 @@ -1749,7 +1749,7 @@ ohhghf = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 -* Offset of radial position of ipfloc=2 pf coils [m] +* Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 zref(1) = 3.6 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 4aeb69afea..9ca3ead55e 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -283,7 +283,7 @@ coheof = 21443595.371072624 * Central solenoid overall current density at end cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * peak current per turn input for PF coil i (A) fcohbop = 0.93491189654662 * ratio of central solenoid overall current density at beginning of pulse / end of flat-top fcuohsu = 0.70 * copper fraction of strand in central solenoid -ipfloc = 2,2,3,3 * Switch for location of PF coil group i; +i_pf_location = 2,2,3,3 * Switch for location of PF coil group i; i_cs_superconductor = 1 * switch for superconductor material in central solenoid; i_pf_superconductor = 3 * switch for superconductor material in PF coils; ncls = 1,1,2,2 * number of PF coils in group j @@ -291,7 +291,7 @@ ngrp = 4 * number of groups of PF coils; Symmetric coil pairs should all be ohhghf = 0.9 * Central solenoid height / TF coil internal height oh_steel_frac = 0.4856940627014451 * central solenoid steel fraction (`iteration variable 122`) rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * average winding pack current density of PF coil i (A/m2) at time of peak -rpf2 = -1.825 * offset (m) of radial position of `ipfloc=2` PF coils from being at +rpf2 = -1.825 * offset (m) of radial position of `i_pf_location=2` PF coils from being at sigpfcf = 0.666 * fraction of JxB hoop force supported by steel case for superconducting PF coils (`ipfres=0`) zref(1) = 3.6 zref(2) = 1.2 diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 590fbee338..bd8b51ec90 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -226,13 +226,13 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon coheof = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at -ipfloc = 2,2,3,3 * Switch for locating scheme of pf coil group i; +i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; ncls = 1,1,2,2, * Number of pf coils in group j ngrp = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) -rpf2 = -1.825 * Offset (m) of radial position of ipfloc=2 pf coils +rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils zref(1) = 3.6 zref(2) = 1.2 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 73282538e3..d0429af690 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -18018,7 +18018,7 @@ iavail = 0 cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i -ipfloc = 2,2,3,3 +i_pf_location = 2,2,3,3 * Switch for superconductor material in pf coils i_pf_superconductor = 3 @@ -18035,7 +18035,7 @@ ohhghf = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 -* Offset of radial position of ipfloc=2 pf coils [m] +* Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 zref(1) = 3.6 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 8752ecee8d..bcc2b662b8 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -9205,13 +9205,13 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon coheof = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at -ipfloc = 2,2,3,3 * Switch for locating scheme of pf coil group i; +i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; ncls = 1,1,2,2, * Number of pf coils in group j ngrp = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) -rpf2 = -1.825 * Offset (m) of radial position of ipfloc=2 pf coils +rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils zref(1) = 3.6 zref(2) = 1.2 diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index ea7379312b..ccd04b53a7 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -226,13 +226,13 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon coheof = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at -ipfloc = 2,2,3,3 * Switch for locating scheme of pf coil group i; +i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; ncls = 1,1,2,2, * Number of pf coils in group j ngrp = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) -rpf2 = -1.825 * Offset (m) of radial position of ipfloc=2 pf coils +rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils zref(1) = 3.6 zref(2) = 1.2 diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index ac69233e21..87f0cddb4e 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -226,13 +226,13 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon coheof = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at -ipfloc = 2,2,3,3 * Switch for locating scheme of pf coil group i; +i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; ncls = 1,1,2,2, * Number of pf coils in group j ngrp = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) -rpf2 = -1.825 * Offset (m) of radial position of ipfloc=2 pf coils +rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils zref(1) = 3.6 zref(2) = 1.2 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 5e5798e716..3a51543c78 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2629,7 +2629,7 @@ "ip": 0.0, "ipedestal": 1.0, "ipeqns": 90.0, - "ipfloc": [ + "i_pf_location": [ 2.0, 2.0, 3.0, @@ -9877,7 +9877,7 @@ "ip": "", "ipedestal": "switch for pedestal profiles:\n
    \n
  • =0 use original parabolic profiles
    • \n
  • =1 use pedestal profile
    • ", "ipeqns": "ipeqns FIX : number of constraint equations available", - "ipfloc": "Switch for location of PF coil group i:\n
      \n
    • =1 PF coil on top of central solenoid (flux ramp only)
      • \n
    • =2 PF coil on top of TF coil (flux ramp only)
      • \n
    • =3 PF coil outside of TF coil (equilibrium coil)
      • \n
    • =4 PF coil, general location (equilibrium coil)
      • \n
    ", + "i_pf_location": "Switch for location of PF coil group i:\n
      \n
    • =1 PF coil on top of central solenoid (flux ramp only)
      • \n
    • =2 PF coil on top of TF coil (flux ramp only)
      • \n
    • =3 PF coil outside of TF coil (equilibrium coil)
      • \n
    • =4 PF coil, general location (equilibrium coil)
      • \n
    ", "ipfres": "switch for PF coil type:\n
      \n
    • =0 superconducting PF coils
      • \n
    • =1 resistive PF coils
      • \n
    ", "ipnet": "Switch for net electric power calculation:\n
      \n
    • =0 scale so that always > 0
      • \n
    • =1 let go < 0 (no c-o-e)
      • \n
    ", "ipnfoms": "ipnfoms FIX : number of available figures of merit", @@ -10533,7 +10533,7 @@ "ripmax": "aximum allowable toroidal field ripple amplitude at plasma edge (%)", "ripple": "peak/average toroidal field ripple at plasma edge (%)", "c_tf_total": "total (summed) current in TF coils (A)", - "rjconpf": "average winding pack current density of PF coil i (A/m2) at time of peak\n current in that coil (calculated for `ipfloc=1` coils)", + "rjconpf": "average winding pack current density of PF coil i (A/m2) at time of peak\n current in that coil (calculated for `i_pf_location=1` coils)", "rjohc": "allowable central solenoid current density at end of flat-top (A/m2)", "rjohc0": "allowable central solenoid current density at beginning of pulse (A/m2)", "rjpfalw": "allowable winding pack current density of PF coil i (A/m2)", @@ -10561,15 +10561,15 @@ "robotics_w": "robotics buildings length, width, height (m)", "rohc": "radius to the centre of the central solenoid (m)", "roughness": "first wall channel roughness epsilon (m)", - "routr": "radial distance (m) from outboard TF coil leg to centre of `ipfloc=3` PF coils", + "routr": "radial distance (m) from outboard TF coil leg to centre of `i_pf_location=3` PF coils", "row": "clearance to building wall for crane operation (m)", "rpf": "radius of PF coil i (m)", - "rpf1": "offset (m) of radial position of `ipfloc=1` PF coils from being directly above\n the central solenoid", - "rpf2": "offset (m) of radial position of `ipfloc=2` PF coils from being at\n rmajor (offset = rpf2triangrminor)", + "rpf1": "offset (m) of radial position of `i_pf_location=1` PF coils from being directly above\n the central solenoid", + "rpf2": "offset (m) of radial position of `i_pf_location=2` PF coils from being at\n rmajor (offset = rpf2triangrminor)", "dr_pf_cryostat": "Radial distance between furthest PF coil (or stellarator\n modular coil) and cryostat (m)", "f_res_plasma_neo": "neo-classical correction factor to res_plasma", "res_plasma": "plasma resistance (ohm)", - "rref": "PF coil radial positioning adjuster:\n
      \n
    • for groups j with ipfloc(j) = 1; rref(j) is ignored
      • \n
    • for groups j with ipfloc(j) = 2; rref(j) is ignored
      • \n
    • for groups j with ipfloc(j) = 3; rref(j) is ignored
      • \n
    • for groups j with ipfloc(j) = 4; rref(j) is radius of\n the coil in units of minor radii from the major radius\n (r = rmajor + rref*rminor)
      • \n
    ", + "rref": "PF coil radial positioning adjuster:\n
      \n
    • for groups j with i_pf_location(j) = 1; rref(j) is ignored
      • \n
    • for groups j with i_pf_location(j) = 2; rref(j) is ignored
      • \n
    • for groups j with i_pf_location(j) = 3; rref(j) is ignored
      • \n
    • for groups j with i_pf_location(j) = 4; rref(j) is radius of\n the coil in units of minor radii from the major radius\n (r = rmajor + rref*rminor)
      • \n
    ", "rrin": "Input IFE repetition rate (Hz) (`ifedrv=3 only`; `itv 156`)", "rrmax": "maximum IFE repetition rate (Hz)", "rsldi": "radius to inboard shield (inside point) (m)", @@ -11242,7 +11242,7 @@ "zl6": "IFE vertical build below centre (m)", "zl7": "IFE vertical build below centre (m)", "zpf": "z (height) location of PF coil i (m)", - "zref": "PF coil vertical positioning adjuster:\n
      \n
    • for groups j with ipfloc(j) = 1; zref(j) is ignored
      • \n
    • for groups j with ipfloc(j) = 2 AND itart=1 (only);\n zref(j) is distance of centre of PF coil from inside\n edge of TF coil (remember that PF coils for STs lie\n within the TF coil)
      • \n
    • for groups j with ipfloc(j) = 3; zref(j) = ratio of\n height of coil group j to plasma minor radius
    \n
  • for groups j with ipfloc(j) = 4; zref(j) = ratio of\n height of coil group j to plasma minor radius
\n", + "zref": "PF coil vertical positioning adjuster:\n
    \n
  • for groups j with i_pf_location(j) = 1; zref(j) is ignored
    • \n
  • for groups j with i_pf_location(j) = 2 AND itart=1 (only);\n zref(j) is distance of centre of PF coil from inside\n edge of TF coil (remember that PF coils for STs lie\n within the TF coil)
    • \n
  • for groups j with i_pf_location(j) = 3; zref(j) = ratio of\n height of coil group j to plasma minor radius
\n
  • for groups j with i_pf_location(j) = 4; zref(j) = ratio of\n height of coil group j to plasma minor radius
    • \n", "zsearch": "", "zu1": "IFE vertical build above centre (m)", "zu2": "IFE vertical build above centre (m)", @@ -18948,7 +18948,7 @@ "fcuohsu", "fcupfsu", "fvssu", - "ipfloc", + "i_pf_location", "ipfres", "itr_sum", "i_cs_superconductor", @@ -20472,7 +20472,7 @@ "ioptimz": "int_variable", "iotabar": "real_variable", "ipedestal": "int_variable", - "ipfloc": "int_array", + "i_pf_location": "int_array", "ipfres": "int_variable", "ipnet": "int_variable", "ipowerflow": "int_variable", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index e2a1c9c326..11e38be7f7 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -72,7 +72,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "itr_sum", 0.0) monkeypatch.setattr(pfv, "sigpfcf", 6.66e-1) monkeypatch.setattr(pfv, "ohhghf", 9.0e-1) - monkeypatch.setattr(pfv, "ipfloc", np.array([2, 2, 3, 3, 0, 0, 0, 0, 0, 0])) + monkeypatch.setattr(pfv, "i_pf_location", np.array([2, 2, 3, 3, 0, 0, 0, 0, 0, 0])) monkeypatch.setattr(pfv, "wts", np.full(22, 0.0)) monkeypatch.setattr(pfv, "powpfres", 0.0) monkeypatch.setattr(pfv, "curpfb", np.full(22, 0.0)) diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 112e126a02..0dda8b82b6 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -541,7 +541,7 @@ iavail = 0 cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i -ipfloc = 2,2,3,3 +i_pf_location = 2,2,3,3 * Switch for superconductor material in pf coils i_pf_superconductor = 3 @@ -558,7 +558,7 @@ ohhghf = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 -* Offset of radial position of ipfloc=2 pf coils [m] +* Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 zref(1) = 3.6 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index eeced85543..df90978a96 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -523,7 +523,7 @@ iavail = 0 cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i -ipfloc = 2,2,3,3 +i_pf_location = 2,2,3,3 * Switch for superconductor material in pf coils i_pf_superconductor = 3 @@ -540,7 +540,7 @@ ohhghf = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 -* Offset of radial position of ipfloc=2 pf coils [m] +* Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 zref(1) = 3.6 diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index c51bf2ce1c..b70ffedc39 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -283,7 +283,7 @@ coheof = 21443595.371072624 * Central solenoid overall current density at end cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * peak current per turn input for PF coil i (A) fcohbop = 0.93491189654662 * ratio of central solenoid overall current density at beginning of pulse / end of flat-top fcuohsu = 0.70 * copper fraction of strand in central solenoid -ipfloc = 2,2,3,3 * Switch for location of PF coil group i; +i_pf_location = 2,2,3,3 * Switch for location of PF coil group i; i_cs_superconductor = 1 * switch for superconductor material in central solenoid; i_pf_superconductor = 3 * switch for superconductor material in PF coils; ncls = 1,1,2,2 * number of PF coils in group j @@ -291,7 +291,7 @@ ngrp = 4 * number of groups of PF coils; Symmetric coil pairs should all be ohhghf = 0.9 * Central solenoid height / TF coil internal height oh_steel_frac = 0.4856940627014451 * central solenoid steel fraction (`iteration variable 122`) rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * average winding pack current density of PF coil i (A/m2) at time of peak -rpf2 = -1.825 * offset (m) of radial position of `ipfloc=2` PF coils from being at +rpf2 = -1.825 * offset (m) of radial position of `i_pf_location=2` PF coils from being at sigpfcf = 0.666 * fraction of JxB hoop force supported by steel case for superconducting PF coils (`ipfres=0`) zref(1) = 3.6 zref(2) = 1.2 diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 2b04448120..ef04afc05b 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1909,7 +1909,7 @@ i_pf_superconductor = 9 * Positioning * *-------------* -ipfloc = 2,3,3,4 +i_pf_location = 2,3,3,4 * DESCRIPTION: Switch for Locating Scheme of PF Coil Group i * =1 PF coil on top of central solenoid (flux ramp only) * =2 PF coil on top of TF coil (flux ramp only) @@ -1919,28 +1919,28 @@ ipfloc = 2,3,3,4 i_sup_pf_shape = 1 -* DESCRIPTION: Switch for the placement of ipfloc = 3 (outboard) PF coils +* DESCRIPTION: Switch for the placement of i_pf_location = 3 (outboard) PF coils * when the TF coils are superconducting (i_tf_sup = 1) * =0 (Default) Outboard PF coils follow TF shape * in an ellipsoidal winding surface * =1 Outboard PF coils all have same radius, cylindrical * winding surface -* JUSTIFICATION: Not used, no ipfloc = 3 coils +* JUSTIFICATION: Not used, no i_pf_location = 3 coils *routr = -* DESCRIPTION: Radial distance (m) from outboard TF coil leg to centre of ipfloc=3 PF coils +* DESCRIPTION: Radial distance (m) from outboard TF coil leg to centre of i_pf_location=3 PF coils * (default = 1.5) -* JUSTIFICATION: Not used, no ipfloc = 3 coils +* JUSTIFICATION: Not used, no i_pf_location = 3 coils *rpf1 = -* DESCRIPTION: offset (m) of radial position of ipfloc=1 PF coils from being directly above +* DESCRIPTION: offset (m) of radial position of i_pf_location=1 PF coils from being directly above * the central solenoid -* JUSTIFICATION: Not used, no ipfloc = 1 coils +* JUSTIFICATION: Not used, no i_pf_location = 1 coils *rpf2 = -* DESCRIPTION: offset (m) of radial position of ipfloc=2 PF coils from being at +* DESCRIPTION: offset (m) of radial position of i_pf_location=2 PF coils from being at *rmajor (offset = rpf2*triang*rminor) -* JUSTIFICATION: Not used, no ipfloc = 2 coils +* JUSTIFICATION: Not used, no i_pf_location = 2 coils ncls = 2,2,2,2 * DESCRIPTION: Number of PF Coils in Group j @@ -1952,13 +1952,13 @@ ngrp = 4 rref(4) = 2.0 zref(4) = 5.2 -* DESCRIPTION: Offset (rminor's) of Radial Position of ipfloc=4 PF coils From Being at Rmajor +* DESCRIPTION: Offset (rminor's) of Radial Position of i_pf_location=4 PF coils From Being at Rmajor * JUSTIFICATION: Position coils inside and in the middle of TF coil *cptdin: Current per turn for PF coil *rjconpf: Current per turn for PF coil resistivity (ohm-m) -*rref: Radius of ipfloc = 4 coil groups. Number of minor radii from major radius -*zref: Height of ipfloc 3/4 coil groups. Units of minor radius +*rref: Radius of i_pf_location = 4 coil groups. Number of minor radii from major radius +*zref: Height of i_pf_location 3/4 coil groups. Units of minor radius *______________________________________________________________________________________________________________________________________________________________________________________________________________________* @@ -2224,7 +2224,7 @@ i_r_cp_top = 2 * JUSTIFICATION: Not scaling cryostat height. *dr_pf_cryostat = -* DESCRIPTION: radial distance between outer edge of largest (`ipfloc=3`) PF coil (or stellarator +* DESCRIPTION: radial distance between outer edge of largest (`i_pf_location=3`) PF coil (or stellarator * modular coil) and cryostat [m]) * JUSTIFICATION: Not scaling cryostat distance. diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index f3150c38bf..de7d5fea92 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -542,7 +542,7 @@ iavail = 0 cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i -ipfloc = 2,2,3,3 +i_pf_location = 2,2,3,3 * Switch for superconductor material in pf coils i_pf_superconductor = 3 @@ -559,7 +559,7 @@ ohhghf = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 -* Offset of radial position of ipfloc=2 pf coils [m] +* Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 zref(1) = 3.6 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 34b445f5a0..868433e5c4 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -1733,7 +1733,7 @@ iavail = 0 cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i -ipfloc = 2,2,3,3 +i_pf_location = 2,2,3,3 * Switch for superconductor material in pf coils i_pf_superconductor = 3 @@ -1750,7 +1750,7 @@ ohhghf = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 -* Offset of radial position of ipfloc=2 pf coils [m] +* Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 zref(1) = 3.6 From fde608d93b1a4f3390c4cdf719120e7921f57274 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 11:53:49 +0000 Subject: [PATCH 05/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'cpt'=20to=20'c?= =?UTF-8?q?=5Fpf=5Fcoil=5Fturn'=20across=20multiple=20files=20for=20consis?= =?UTF-8?q?tency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 53 +++++++++++++++------------- process/power.py | 24 ++++++++----- process/pulse.py | 4 +-- source/fortran/pfcoil_variables.f90 | 4 +-- tests/integration/ref_dicts.json | 6 ++-- tests/integration/test_pfcoil_int.py | 2 +- tests/unit/test_pfcoil.py | 2 +- tests/unit/test_power.py | 8 ++--- tests/unit/test_pulse.py | 8 ++--- 9 files changed, 60 insertions(+), 51 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index 1e92c388c8..9b78407778 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -751,17 +751,17 @@ def pfcoil(self): # user-provided waveforms etc. (cptdin, fcohbop, fcohbof) for k in range(6): # time points for i in range(pfv.ncirt - 1): - pfv.cpt[i, k] = pfv.waves[i, k] * math.copysign( + pfv.c_pf_coil_turn[i, k] = pfv.waves[i, k] * math.copysign( pfv.cptdin[i], pfv.ric[i] ) # Plasma wave form - pfv.cpt[pfv.ncirt - 1, 0] = 0.0e0 - pfv.cpt[pfv.ncirt - 1, 1] = 0.0e0 - pfv.cpt[pfv.ncirt - 1, 2] = pv.plasma_current - pfv.cpt[pfv.ncirt - 1, 3] = pv.plasma_current - pfv.cpt[pfv.ncirt - 1, 4] = pv.plasma_current - pfv.cpt[pfv.ncirt - 1, 5] = 0.0e0 + pfv.c_pf_coil_turn[pfv.ncirt - 1, 0] = 0.0e0 + pfv.c_pf_coil_turn[pfv.ncirt - 1, 1] = 0.0e0 + pfv.c_pf_coil_turn[pfv.ncirt - 1, 2] = pv.plasma_current + pfv.c_pf_coil_turn[pfv.ncirt - 1, 3] = pv.plasma_current + pfv.c_pf_coil_turn[pfv.ncirt - 1, 4] = pv.plasma_current + pfv.c_pf_coil_turn[pfv.ncirt - 1, 5] = 0.0e0 def efc( self, @@ -1442,17 +1442,19 @@ def vsec(self): pfv.vsefsu = 0.0e0 for i in range(pf.nef): - pf.vsdum[i, 0] = pfv.sxlg[pfv.ncirt - 1, i] * pfv.cpt[i, 1] - pf.vsdum[i, 1] = pfv.sxlg[pfv.ncirt - 1, i] * pfv.cpt[i, 2] + pf.vsdum[i, 0] = pfv.sxlg[pfv.ncirt - 1, i] * pfv.c_pf_coil_turn[i, 1] + pf.vsdum[i, 1] = pfv.sxlg[pfv.ncirt - 1, i] * pfv.c_pf_coil_turn[i, 2] pfv.vsefsu = pfv.vsefsu + (pf.vsdum[i, 1] - pf.vsdum[i, 0]) # Central Solenoid startup volt-seconds if bv.iohcl != 0: pf.vsdum[pfv.nohc - 1, 0] = ( - pfv.sxlg[pfv.ncirt - 1, pfv.ncirt - 2] * pfv.cpt[pfv.ncirt - 2, 1] + pfv.sxlg[pfv.ncirt - 1, pfv.ncirt - 2] + * pfv.c_pf_coil_turn[pfv.ncirt - 2, 1] ) pf.vsdum[pfv.nohc - 1, 1] = ( - pfv.sxlg[pfv.ncirt - 1, pfv.ncirt - 2] * pfv.cpt[pfv.ncirt - 2, 2] + pfv.sxlg[pfv.ncirt - 1, pfv.ncirt - 2] + * pfv.c_pf_coil_turn[pfv.ncirt - 2, 2] ) pfv.vsohsu = pf.vsdum[pfv.nohc - 1, 1] - pf.vsdum[pfv.nohc - 1, 0] @@ -1462,14 +1464,15 @@ def vsec(self): # Burn volt-seconds if bv.iohcl != 0: pf.vsdum[pfv.nohc - 1, 2] = ( - pfv.sxlg[pfv.ncirt - 1, pfv.ncirt - 2] * pfv.cpt[pfv.ncirt - 2, 4] + pfv.sxlg[pfv.ncirt - 1, pfv.ncirt - 2] + * pfv.c_pf_coil_turn[pfv.ncirt - 2, 4] ) pfv.vsohbn = pf.vsdum[pfv.nohc - 1, 2] - pf.vsdum[pfv.nohc - 1, 1] # PF volt-seconds during burn pfv.vsefbn = 0.0e0 for i in range(pf.nef): - pf.vsdum[i, 2] = pfv.sxlg[pfv.ncirt - 1, i] * pfv.cpt[i, 4] + pf.vsdum[i, 2] = pfv.sxlg[pfv.ncirt - 1, i] * pfv.c_pf_coil_turn[i, 4] pfv.vsefbn = pfv.vsefbn + (pf.vsdum[i, 2] - pf.vsdum[i, 1]) pfv.vsbn = pfv.vsohbn + pfv.vsefbn @@ -2559,12 +2562,12 @@ def outvolt(self): for k in range(pfv.ncirt - 1): line = f"\t{k}\t\t" for jj in range(6): - line += f"\t{pfv.cpt[k, jj] * pfv.turns[k]:.3e}" + line += f"\t{pfv.c_pf_coil_turn[k, jj] * pfv.turns[k]:.3e}" op.write(self.outfile, line) line = "Plasma (A)\t\t" for jj in range(6): - line += f"\t{pfv.cpt[pfv.ncirt - 1, jj]:.3e}" + line += f"\t{pfv.c_pf_coil_turn[pfv.ncirt - 1, jj]:.3e}" op.write(self.outfile, line) @@ -2574,12 +2577,12 @@ def outvolt(self): op.write( self.outfile, ( - f"{k}\t\t\t{pfv.cpt[k, 0] * pfv.turns[k]:.3e}\t" - f"{pfv.cpt[k, 1] * pfv.turns[k]:.3e}\t" - f"{-pfv.cpt[k, 1] * pfv.turns[k] * (pfv.fcohbof / pfv.fcohbop):.3e}\t" - f"{-pfv.cpt[k, 1] * pfv.turns[k] * (pfv.fcohbof / pfv.fcohbop):.3e}\t" - f"{-pfv.cpt[k, 1] * pfv.turns[k] * (1.0e0 / pfv.fcohbop):.3e}\t" - f"{pfv.cpt[k, 5] * pfv.turns[k]:.3e}" + f"{k}\t\t\t{pfv.c_pf_coil_turn[k, 0] * pfv.turns[k]:.3e}\t" + f"{pfv.c_pf_coil_turn[k, 1] * pfv.turns[k]:.3e}\t" + f"{-pfv.c_pf_coil_turn[k, 1] * pfv.turns[k] * (pfv.fcohbof / pfv.fcohbop):.3e}\t" + f"{-pfv.c_pf_coil_turn[k, 1] * pfv.turns[k] * (pfv.fcohbof / pfv.fcohbop):.3e}\t" + f"{-pfv.c_pf_coil_turn[k, 1] * pfv.turns[k] * (1.0e0 / pfv.fcohbop):.3e}\t" + f"{pfv.c_pf_coil_turn[k, 5] * pfv.turns[k]:.3e}" ), ) @@ -2590,9 +2593,9 @@ def outvolt(self): self.outfile, ( f"{k}\t\t\t{0.0:.3e}\t{0.0:.3e}\t" - f"{(pfv.cpt[k, 2] + pfv.cpt[k, 1] * pfv.fcohbof / pfv.fcohbop) * pfv.turns[k]:.3e}\t" - f"{(pfv.cpt[k, 3] + pfv.cpt[k, 1] * pfv.fcohbof / pfv.fcohbop) * pfv.turns[k]:.3e}\t" - f"{(pfv.cpt[k, 4] + pfv.cpt[k, 1] * 1.0e0 / pfv.fcohbop) * pfv.turns[k]:.3e}\t" + f"{(pfv.c_pf_coil_turn[k, 2] + pfv.c_pf_coil_turn[k, 1] * pfv.fcohbof / pfv.fcohbop) * pfv.turns[k]:.3e}\t" + f"{(pfv.c_pf_coil_turn[k, 3] + pfv.c_pf_coil_turn[k, 1] * pfv.fcohbof / pfv.fcohbop) * pfv.turns[k]:.3e}\t" + f"{(pfv.c_pf_coil_turn[k, 4] + pfv.c_pf_coil_turn[k, 1] * 1.0e0 / pfv.fcohbop) * pfv.turns[k]:.3e}\t" "0.0e0" ), ) @@ -2635,7 +2638,7 @@ def outvolt(self): self.outfile, circuit_name, circuit_var_name, - pfv.cpt[k, jjj] * pfv.turns[k], + pfv.c_pf_coil_turn[k, jjj] * pfv.turns[k], ) def selfinductance(self, a, b, c, n): diff --git a/process/power.py b/process/power.py index 51ec94bc9a..f5ca07cbe4 100644 --- a/process/power.py +++ b/process/power.py @@ -148,7 +148,7 @@ def pfpwr(self, output: bool): delktim = times_variables.t_current_ramp_up # PF system (including Central Solenoid solenoid) inductive MVA requirements - # pfcoil_variables.cpt(i,j) : current per turn of coil i at (end) time period j (A) + # pfcoil_variables.c_pf_coil_turn(i,j) : current per turn of coil i at (end) time period j (A) powpfi = 0.0e0 powpfr = 0.0e0 powpfr2 = 0.0e0 @@ -172,7 +172,10 @@ def pfpwr(self, output: bool): # Voltage in circuit jpf due to change in current from circuit ipf vpfij = ( pfcoil_variables.sxlg[jpf, ipf] - * (pfcoil_variables.cpt[ipf, 2] - pfcoil_variables.cpt[ipf, 1]) + * ( + pfcoil_variables.c_pf_coil_turn[ipf, 2] + - pfcoil_variables.c_pf_coil_turn[ipf, 1] + ) / delktim ) @@ -181,7 +184,8 @@ def pfpwr(self, output: bool): # MVA in circuit jpf at time, times_variables.tim(3) due to changes in current powpfii[jpf] = ( - powpfii[jpf] + vpfij * pfcoil_variables.cpt[jpf, 2] / 1.0e6 + powpfii[jpf] + + vpfij * pfcoil_variables.c_pf_coil_turn[jpf, 2] / 1.0e6 ) # Term used for calculating stored energy at each time @@ -189,17 +193,19 @@ def pfpwr(self, output: bool): inductxcurrent[time] = ( inductxcurrent[time] + pfcoil_variables.sxlg[jpf, ipf] - * pfcoil_variables.cpt[ipf, time] + * pfcoil_variables.c_pf_coil_turn[ipf, time] ) - # engx = engx + pfcoil_variables.sxlg(jpf,ipf)*pfcoil_variables.cpt(ipf,5) + # engx = engx + pfcoil_variables.sxlg(jpf,ipf)*pfcoil_variables.c_pf_coil_turn(ipf,5) # Stored magnetic energy of the poloidal field at each time # 'time' is the time INDEX. 'tim' is the time. for time in range(6): poloidalenergy[time] = ( poloidalenergy[time] - + 0.5e0 * inductxcurrent[time] * pfcoil_variables.cpt[jpf, time] + + 0.5e0 + * inductxcurrent[time] + * pfcoil_variables.c_pf_coil_turn[jpf, time] ) # do time = 1,5 @@ -212,21 +218,21 @@ def pfpwr(self, output: bool): # # end do - # #engxpc = 0.5e0 * engx * pfcoil_variables.cpt(jpf,5) + # #engxpc = 0.5e0 * engx * pfcoil_variables.c_pf_coil_turn(jpf,5) # #ensxpf = ensxpf + engxpc # Resistive power in circuits at times times_variables.tim(3) and times_variables.tim(5) respectively (MW) powpfr = ( powpfr + pfcoil_variables.turns[jpf] - * pfcoil_variables.cpt[jpf, 2] + * pfcoil_variables.c_pf_coil_turn[jpf, 2] * cktr[jjpf] / 1.0e6 ) powpfr2 = ( powpfr2 + pfcoil_variables.turns[jpf] - * pfcoil_variables.cpt[jpf, 4] + * pfcoil_variables.c_pf_coil_turn[jpf, 4] * cktr[jjpf] / 1.0e6 ) diff --git a/process/pulse.py b/process/pulse.py index 77105d9b30..34857db6f3 100644 --- a/process/pulse.py +++ b/process/pulse.py @@ -51,11 +51,11 @@ def tohswg(self, output: bool) -> None: # Current/turn in Central Solenoid at beginning of pulse (A/turn) - ioht1 = pfcoil_variables.cpt[pfcoil_variables.nohc - 1, 1] + ioht1 = pfcoil_variables.c_pf_coil_turn[pfcoil_variables.nohc - 1, 1] # Current/turn in Central Solenoid at start of flat-top (A/turn) - ioht2 = pfcoil_variables.cpt[pfcoil_variables.nohc - 1, 2] + ioht2 = pfcoil_variables.c_pf_coil_turn[pfcoil_variables.nohc - 1, 2] # Central Solenoid resistance (ohms) diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index fe12e0914d..03a2b0789f 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -77,7 +77,7 @@ module pfcoil_variables real(dp) :: coheof !! Central solenoid overall current density at end of flat-top (A/m2) (`iteration variable 37`) (`sweep variable 62`) - real(dp), dimension(ngc2,6) :: cpt + real(dp), dimension(ngc2,6) :: c_pf_coil_turn !! current per turn in coil i at time j (A) real(dp), dimension(ngc2) :: cptdin @@ -429,7 +429,7 @@ subroutine init_pfcoil_variables 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0/) cohbop = 0.0D0 coheof = 1.85D7 - cpt = 0.0D0 + c_pf_coil_turn = 0.0D0 cptdin = (/4.0D4, 4.0D4, 4.0D4, & 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, & 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, & diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 3a51543c78..9dfcffbb3c 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1544,7 +1544,7 @@ "cppa": 0.0, "cpstcst": 0.0, "cpstflnc": 10.0, - "cpt": 0.0, + "c_pf_coil_turn": 0.0, "cptdin": 40000.0, "cpttf": 70000.0, "cpttf_max": 90000.0, @@ -9206,7 +9206,7 @@ "cppa": "", "cpstcst": "ST centrepost direct cost (M$)", "cpstflnc": "allowable ST centrepost neutron fluence (MW-yr/m2)", - "cpt": "current per turn in coil i at time j (A)", + "c_pf_coil_turn": "current per turn in coil i at time j (A)", "cptdin": "peak current per turn input for PF coil i (A)", "cpttf": "TF coil current per turn (A). (calculated for stellarators) (calculated for\n integer-turn TF coils `i_tf_turns_integer=1`) (`iteration variable 60`)", "cpttf_max": "Max TF coil current per turn [A]. (for stellarators and `i_tf_turns_integer=1`)\n (`constraint equation 77`)", @@ -18937,7 +18937,7 @@ "ccls_ma", "cohbop", "coheof", - "cpt", + "c_pf_coil_turn", "cptdin", "curpfb", "curpff", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 11e38be7f7..8538834cb2 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -94,7 +94,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "alfapf", 5.0e-10) monkeypatch.setattr(pfv, "ncirt", 8) monkeypatch.setattr(pfv, "pfclres", 2.5e-8) - monkeypatch.setattr(pfv, "cpt", np.full([22, 6], 0.0)) + monkeypatch.setattr(pfv, "c_pf_coil_turn", np.full([22, 6], 0.0)) monkeypatch.setattr(pfv, "waves", np.full([22, 6], 0.0)) monkeypatch.setattr(pfv, "sxlg", np.full([22, 22], 0.0)) monkeypatch.setattr(pfv, "sigpfcalw", 5.0e2) diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index af0e321a7b..0b787c4abb 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1227,7 +1227,7 @@ def test_vsec(pfcoil, monkeypatch): monkeypatch.setattr(pfv, "vsohbn", 0) monkeypatch.setattr( pfv, - "cpt", + "c_pf_coil_turn", np.array( [ [ diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 73e243a4b8..13a16bae26 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -193,7 +193,7 @@ class PfpwrParam(NamedTuple): ngrp: Any = None - cpt: Any = None + c_pf_coil_turn: Any = None pfwpmw: Any = None @@ -281,7 +281,7 @@ class PfpwrParam(NamedTuple): acptmax=0, srcktpm=0, ngrp=4, - cpt=np.array( + c_pf_coil_turn=np.array( ( ( 0, @@ -1024,7 +1024,7 @@ class PfpwrParam(NamedTuple): acptmax=24.816666666666666, srcktpm=1071.1112934857531, ngrp=4, - cpt=np.array( + c_pf_coil_turn=np.array( ( ( 0, @@ -1798,7 +1798,7 @@ def test_pfpwr(pfpwrparam, monkeypatch, power): monkeypatch.setattr(pfcoil_variables, "ngrp", pfpwrparam.ngrp) - monkeypatch.setattr(pfcoil_variables, "cpt", pfpwrparam.cpt) + monkeypatch.setattr(pfcoil_variables, "c_pf_coil_turn", pfpwrparam.c_pf_coil_turn) monkeypatch.setattr(pfcoil_variables, "pfwpmw", pfpwrparam.pfwpmw) diff --git a/tests/unit/test_pulse.py b/tests/unit/test_pulse.py index 23965c0eaa..07338c579d 100644 --- a/tests/unit/test_pulse.py +++ b/tests/unit/test_pulse.py @@ -40,7 +40,7 @@ class TohswgParam(NamedTuple): sxlg: Any = None - cpt: Any = None + c_pf_coil_turn: Any = None ric: Any = None @@ -314,7 +314,7 @@ class BurnParam(NamedTuple): ), order="F", ).transpose(), - cpt=np.array( + c_pf_coil_turn=np.array( ( ( 0, @@ -872,7 +872,7 @@ class BurnParam(NamedTuple): ), order="F", ).transpose(), - cpt=np.array( + c_pf_coil_turn=np.array( ( ( 0, @@ -1243,7 +1243,7 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): monkeypatch.setattr(pfcoil_variables, "sxlg", tohswgparam.sxlg) - monkeypatch.setattr(pfcoil_variables, "cpt", tohswgparam.cpt) + monkeypatch.setattr(pfcoil_variables, "c_pf_coil_turn", tohswgparam.c_pf_coil_turn) monkeypatch.setattr(pfcoil_variables, "ric", tohswgparam.ric) From a6161109fbae6d07a264343ed07a4c2dcdddc60c Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 13:19:35 +0000 Subject: [PATCH 06/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'ipfres'=20to=20'?= =?UTF-8?q?i=5Fpf=5Fconductor'=20across=20multiple=20files=20for=20consist?= =?UTF-8?q?ency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/central-solenoid.md | 2 +- .../proc-pages/eng-models/pf-coil.md | 6 ++--- process/costs.py | 16 ++++++++------ process/init.py | 2 +- process/pfcoil.py | 22 +++++++++---------- process/power.py | 2 +- process/pulse.py | 2 +- process/sctfcoil.py | 8 +++---- process/structure.py | 10 ++++----- source/fortran/input.f90 | 6 ++--- source/fortran/numerics.f90 | 4 ++-- source/fortran/pfcoil_variables.f90 | 10 ++++----- source/fortran/tfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 20 ++++++++--------- tests/integration/test_pfcoil_int.py | 4 ++-- .../large_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 8 +++---- tests/unit/test_costs_1990.py | 10 ++++----- tests/unit/test_pulse.py | 8 +++---- tests/unit/test_sctfcoil.py | 8 +++---- tests/unit/test_structure.py | 4 ++-- 21 files changed, 80 insertions(+), 78 deletions(-) diff --git a/documentation/proc-pages/eng-models/central-solenoid.md b/documentation/proc-pages/eng-models/central-solenoid.md index f964616903..516168c934 100644 --- a/documentation/proc-pages/eng-models/central-solenoid.md +++ b/documentation/proc-pages/eng-models/central-solenoid.md @@ -11,7 +11,7 @@ is present, and should be assigned a non-zero thickness `dr_cs`. A value of `ioh that no central solenoid is present, in which case the thickness `dr_cs` should be zero. No PF coils should be located at positions defined by `i_pf_location(j)` = 1 if no central solenoid is present. -The central solenoid can be either resistive or superconducting (controlled via switch `ipfres` as +The central solenoid can be either resistive or superconducting (controlled via switch `i_pf_conductor` as for the other PF coils), and if superconducting, switch `i_pf_superconductor` determines the superconducting material to use - its value is used like `isumattf` and `i_pf_superconductor`. The copper fraction (by volume) of the superconducting strands is `fcuohsu`. diff --git a/documentation/proc-pages/eng-models/pf-coil.md b/documentation/proc-pages/eng-models/pf-coil.md index 7938587792..d4c60556fe 100644 --- a/documentation/proc-pages/eng-models/pf-coil.md +++ b/documentation/proc-pages/eng-models/pf-coil.md @@ -58,10 +58,10 @@ ramp-up period, although it will pass through zero during the burn phase. cross-sectional area of supporting steel to use - if pfv.ipfres == 0: + if pfv.i_pf_conductor == 0: # Superconducting coil # Updated assumptions: 500 MPa stress limit with all of the force # supported in the conduit (steel) case. @@ -1084,7 +1084,7 @@ def ohcalc(self): pf.bpf2[pfv.nohc - 1] = max(bohco, abs(bzo)) # Stress ==> cross-sectional area of supporting steel to use - if pfv.ipfres == 0: + if pfv.i_pf_conductor == 0: # Superconducting coil # New calculation from M. N. Wilson for hoop stress @@ -1152,7 +1152,7 @@ def ohcalc(self): pfv.awpoh = da * da / (2.0e0 * da - pfv.awpoh) # Weight of conductor in central Solenoid - if pfv.ipfres == 0: + if pfv.i_pf_conductor == 0: pfv.wtc[pfv.nohc - 1] = ( pfv.awpoh * (1.0e0 - pfv.vfohc) @@ -1171,7 +1171,7 @@ def ohcalc(self): * constants.dcopper ) - if pfv.ipfres == 0: + if pfv.i_pf_conductor == 0: # Allowable coil overall current density at EOF # (superconducting coils only) @@ -1844,7 +1844,7 @@ def outpf(self): op.oblnkl(self.outfile) op.ovarin(self.mfile, "Existence_of_central_solenoid", "(iohcl)", bv.iohcl) else: - if pfv.ipfres == 0: + if pfv.i_pf_conductor == 0: op.ocmmnt(self.outfile, "Superconducting central solenoid") op.ovarin( @@ -2222,7 +2222,7 @@ def outpf(self): else: op.ocmmnt(self.outfile, "Resistive central solenoid") - if pfv.ipfres == 0: + if pfv.i_pf_conductor == 0: op.oblnkl(self.outfile) op.ocmmnt(self.outfile, "Superconducting PF coils") @@ -2443,7 +2443,7 @@ def outpf(self): # PF coils for k in range(pf.nef): - if pfv.ipfres == 0: + if pfv.i_pf_conductor == 0: op.write( self.outfile, f"PF {k}\t{pfv.ric[k]:.2e}\t{pfv.rjpfalw[k]:.2e}\t{pfv.rjconpf[k]:.2e}\t{pfv.rjconpf[k] / pfv.rjpfalw[k]:.2e}\t{pfv.wtc[k]:.2e}\t{pfv.wts[k]:.2e}\t{pfv.bpf[k]:.2e}", @@ -2456,7 +2456,7 @@ def outpf(self): # Central Solenoid, if present if bv.iohcl != 0: - if pfv.ipfres == 0: + if pfv.i_pf_conductor == 0: # Issue #328 op.write( self.outfile, diff --git a/process/power.py b/process/power.py index f5ca07cbe4..450960d07b 100644 --- a/process/power.py +++ b/process/power.py @@ -787,7 +787,7 @@ def power1(self): tfcoil_variables.cryo_cool_req = 0.0e0 # Superconductors TF/PF cryogenic cooling - if tfcoil_variables.i_tf_sup == 1 or pfcoil_variables.ipfres == 0: + if tfcoil_variables.i_tf_sup == 1 or pfcoil_variables.i_pf_conductor == 0: # heat_transport_variables.helpow calculation heat_transport_variables.helpow = self.cryo( tfcoil_variables.i_tf_sup, diff --git a/process/pulse.py b/process/pulse.py index 34857db6f3..8e335a2aa9 100644 --- a/process/pulse.py +++ b/process/pulse.py @@ -59,7 +59,7 @@ def tohswg(self, output: bool) -> None: # Central Solenoid resistance (ohms) - if pfcoil_variables.ipfres == 0: + if pfcoil_variables.i_pf_conductor == 0: r = 0.0e0 else: r = ( diff --git a/process/sctfcoil.py b/process/sctfcoil.py index e96ac06c30..4f3235125a 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1271,7 +1271,7 @@ def sctfcoil(self, output: bool): build_variables.tf_in_cs, build_variables.dr_tf_inboard, build_variables.dr_cs_tf_gap, - pfcoil_variables.ipfres, + pfcoil_variables.i_pf_conductor, pfcoil_variables.coheof, pfcoil_variables.cohbop, pfcoil_variables.cptdin, @@ -3586,7 +3586,7 @@ def stresscl( tf_in_cs, dr_tf_inboard, dr_cs_tf_gap, - ipfres, + i_pf_conductor, coheof, cohbop, cptdin, @@ -3772,7 +3772,7 @@ def stresscl( radtf[0] = dr_bore # Superconducting CS - if ipfres == 0: + if i_pf_conductor == 0: # Getting the turn dimention from scratch # as the TF is called before CS in caller.f90 # -# @@ -4241,7 +4241,7 @@ def stresscl( # -------------------------------- # SC central solenoid coil stress unsmearing (bucked and wedged only) # --- - if i_tf_bucking >= 2 and ipfres == 0: + if i_tf_bucking >= 2 and i_pf_conductor == 0: # Central Solenoid (OH) steel conduit stress unsmearing factors for ii in range(n_radial_array): sig_tf_r[ii] = sig_tf_r[ii] * eyoung_cs_stiffest_leg / eyoung_axial[0] diff --git a/process/structure.py b/process/structure.py index fab2aa1c6a..d9cafc1c45 100644 --- a/process/structure.py +++ b/process/structure.py @@ -54,7 +54,7 @@ def run(self, output: bool = False) -> None: pv.kappa, pv.bt, tfv.i_tf_sup, - pfv.ipfres, + pfv.i_pf_conductor, bv.dr_tf_inner_bore + bv.dr_tf_outboard + bv.dr_tf_inboard, bv.hmax, fwbsv.whtshld, @@ -76,7 +76,7 @@ def structure( akappa, b0, i_tf_sup, - ipfres, + i_pf_conductor, tf_h_width, tfhmax, shldmass, @@ -112,8 +112,8 @@ def structure( :param itfsup: switch denoting whether TF coils are superconducting :type itfsup: integer - :param ipfres: switch denoting whether PF & CS coils are resistive - :type ipfres: integer + :param i_pf_conductor: switch denoting whether PF & CS coils are resistive + :type i_pf_conductor: integer :param tf_h_width: TF coil horizontal dr_bore (m) :type tf_h_width: float @@ -175,7 +175,7 @@ def structure( coldmass = 0.0e0 if i_tf_sup == 1: coldmass = coldmass + tfmass + aintmass + dewmass - if ipfres != 1: + if i_pf_conductor != 1: coldmass = coldmass + pfmass # Coil gravity support mass diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index a7be97017b..25e8a56533 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -296,7 +296,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) use numerics, only: factor, boundl, minmax, neqns, nvar, epsfcn, ixc, & epsvmc, ftol, ipnvars, ioptimz, nineqns, ipeqns, boundu, icc, ipnfoms, name_xc use pfcoil_variables, only: rhopfbus, rjconpf, zref, fcuohsu, oh_steel_frac, vf, & - coheof, sigpfcalw, alstroh, ipfres, fcupfsu, fvssu, etapsu, i_cs_stress, & + coheof, sigpfcalw, alstroh, i_pf_conductor, fcupfsu, fvssu, etapsu, i_cs_stress, & fbmaxcs, ngc, rpf2, fcohbop, ohhghf, vfohc, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & ngrp, i_pf_superconductor, nfxfh, alfapf, routr, sigpfcf, pfclres, bmaxcs_lim, & ncls, nfixmx, cptdin, i_pf_location, i_sup_pf_shape, rref, i_pf_current, & @@ -1852,8 +1852,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('i_pf_location') call parse_int_array('i_pf_location', i_pf_location, isub1, n_pf_groups_max, & 'PF coil location', icode) - case ('ipfres') - call parse_int_variable('ipfres', ipfres, 0, 1, & + case ('i_pf_conductor') + call parse_int_variable('i_pf_conductor', i_pf_conductor, 0, 1, & 'Switch for supercond / resist PF coils') case ('i_cs_superconductor') call parse_int_variable('i_cs_superconductor', i_cs_superconductor, 1, 9, & diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index e534bc6bf5..6a4d593488 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -123,9 +123,9 @@ module numerics !! (itv 104,1,74) !!
  • (24) Beta upper limit (itv 36,1,2,3,4,6,18) !!
  • (25) Peak toroidal field upper limit (itv 35,3,13,29) - !!
  • (26) Central solenoid EOF current density upper limit (ipfres=0) + !!
  • (26) Central solenoid EOF current density upper limit (i_pf_conductor=0) !! (itv 38,37,41,12) - !!
  • (27) Central solenoid BOP current density upper limit (ipfres=0) + !!
  • (27) Central solenoid BOP current density upper limit (i_pf_conductor=0) !! (itv 39,37,41,12) !!
  • (28) Fusion gain Q lower limit (itv 45,47,40) !!
  • (29) Inboard radial build consistency (itv 3,1,13,16,29,42,61) diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 03a2b0789f..9208159f92 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -122,7 +122,7 @@ module pfcoil_variables !! - =3 PF coil outside of TF coil (equilibrium coil) !! - =4 PF coil, general location (equilibrium coil) - integer :: ipfres + integer :: i_pf_conductor !! switch for PF & CS coil conductor type: !! !! - =0 superconducting PF coils @@ -228,7 +228,7 @@ module pfcoil_variables !! steel case thickness for PF coil i (m) real(dp) :: pfclres - !! PF coil resistivity (if ipfres=1) (Ohm-m) + !! PF coil resistivity (if i_pf_conductor=1) (Ohm-m) real(dp) :: rhopfbus !! Resistivity of CS and PF coil bus bars (irrespective of @@ -303,10 +303,10 @@ module pfcoil_variables real(dp) :: sigpfcalw !! maximum permissible tensile stress (MPa) in steel coil cases for superconducting - !! PF coils (`ipfres=0`) + !! PF coils (`i_pf_conductor=0`) real(dp) :: sigpfcf - !! fraction of JxB hoop force supported by steel case for superconducting PF coils (`ipfres=0`) + !! fraction of JxB hoop force supported by steel case for superconducting PF coils (`i_pf_conductor=0`) real(dp), dimension(ngc2,ngc2) :: sxlg !! mutual inductance matrix (H) @@ -444,7 +444,7 @@ subroutine init_pfcoil_variables fcupfsu = 0.69D0 fvssu = 1.0 i_pf_location = (/2,2,3,0,0,0,0,0,0,0/) - ipfres = 0 + i_pf_conductor = 0 itr_sum = 0.0D0 i_cs_superconductor = 1 i_pf_superconductor = 1 diff --git a/source/fortran/tfcoil_variables.f90 b/source/fortran/tfcoil_variables.f90 index 73cb5081d9..bd967508ab 100644 --- a/source/fortran/tfcoil_variables.f90 +++ b/source/fortran/tfcoil_variables.f90 @@ -430,8 +430,8 @@ module tfcoil_variables ! real(dp) :: strtf0 !! Maximum shear stress (Tresca criterion) in CS structures at CS flux swing [Pa]: !! - !! - If superconducting CS (ipfres = 0): turn steel conduits stress - !! - If resistive CS (ipfres = 1): copper conductor stress + !! - If superconducting CS (i_pf_conductor = 0): turn steel conduits stress + !! - If resistive CS (i_pf_conductor = 1): copper conductor stress !! !! Quantity only computed for bucked and wedged design (`i_tf_bucking >= 2`) !! Def : CS Flux swing, instant when the current changes sign in CS (null current) diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 9dfcffbb3c..eb95346df6 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2641,7 +2641,7 @@ 0.0, 0.0 ], - "ipfres": 0.0, + "i_pf_conductor": 0.0, "ipnet": 0.0, "ipnfoms": 19.0, "n_confinement_scalings": 48.0, @@ -9878,7 +9878,7 @@ "ipedestal": "switch for pedestal profiles:\n
      \n
    • =0 use original parabolic profiles
      • \n
    • =1 use pedestal profile
      • ", "ipeqns": "ipeqns FIX : number of constraint equations available", "i_pf_location": "Switch for location of PF coil group i:\n
        \n
      • =1 PF coil on top of central solenoid (flux ramp only)
        • \n
      • =2 PF coil on top of TF coil (flux ramp only)
        • \n
      • =3 PF coil outside of TF coil (equilibrium coil)
        • \n
      • =4 PF coil, general location (equilibrium coil)
        • \n
      ", - "ipfres": "switch for PF coil type:\n
        \n
      • =0 superconducting PF coils
        • \n
      • =1 resistive PF coils
        • \n
      ", + "i_pf_conductor": "switch for PF coil type:\n
        \n
      • =0 superconducting PF coils
        • \n
      • =1 resistive PF coils
        • \n
      ", "ipnet": "Switch for net electric power calculation:\n
        \n
      • =0 scale so that always > 0
        • \n
      • =1 let go < 0 (no c-o-e)
        • \n
      ", "ipnfoms": "ipnfoms FIX : number of available figures of merit", "n_confinement_scalings": "number of energy confinement time scaling laws", @@ -9954,7 +9954,7 @@ "ki": "", "kron": "", "ksic": "power fraction for outboard double-null scrape-off plasma", - "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)
        \n
        \n
      • ( 1) Beta (consistency equation) (itv 5)\n
      • ( 2) Global power balance (consistency equation) (itv 10,1,2,3,4,6,11)\n
      • ( 3) Ion power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
      • ( 4) Electron power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
      • ( 5) Density upper limit (itv 9,1,2,3,4,5,6)\n
      • ( 6) (Epsilon x beta poloidal) upper limit (itv 8,1,2,3,4,6)\n
      • ( 7) Beam ion density (NBI) (consistency equation) (itv 7)\n
      • ( 8) Neutron wall load upper limit (itv 14,1,2,3,4,6)\n
      • ( 9) Fusion power upper limit (itv 26,1,2,3,4,6)\n
      • (10) Toroidal field 1/R (consistency equation) (itv 12,1,2,3,13 )\n
      • (11) Radial build (consistency equation) (itv 3,1,13,16,29,42,61)\n
      • (12) Volt second lower limit (STEADY STATE) (itv 15,1,2,3)\n
      • (13) Burn time lower limit (PULSE) (itv 21,1,16,17,29,42,44,61)\n (itv 19,1,2,3,6)\n
      • (14) Neutral beam decay lengths to plasma centre (NBI) (consistency equation)\n
      • (15) LH power threshold limit (itv 103)\n
      • (16) Net electric power lower limit (itv 25,1,2,3)\n
      • (17) Radiation fraction upper limit (itv 28)\n
      • (18) Divertor heat load upper limit (itv 27)\n
      • (19) MVA upper limit (itv 30)\n
      • (20) Neutral beam tangency radius upper limit (NBI) (itv 33,31,3,13)\n
      • (21) Plasma minor radius lower limit (itv 32)\n
      • (22) Divertor collisionality upper limit (itv 34,43)\n
      • (23) Conducting shell to plasma minor radius ratio upper limit\n (itv 104,1,74)\n
      • (24) Beta upper limit (itv 36,1,2,3,4,6,18)\n
      • (25) Peak toroidal field upper limit (itv 35,3,13,29)\n
      • (26) Central solenoid EOF current density upper limit (ipfres=0)\n (itv 38,37,41,12)\n
      • (27) Central solenoid BOP current density upper limit (ipfres=0)\n (itv 39,37,41,12)\n
      • (28) Fusion gain Q lower limit (itv 45,47,40)\n
      • (29) Inboard radial build consistency (itv 3,1,13,16,29,42,61)\n
      • (30) Injection power upper limit (itv 46,47,11)\n
      • (31) TF coil case stress upper limit (SCTF) (itv 48,56,57,58,59,60,24)\n
      • (32) TF coil conduit stress upper limit (SCTF) (itv 49,56,57,58,59,60,24)\n
      • (33) I_op / I_critical (TF coil) (SCTF) (itv 50,56,57,58,59,60,24)\n
      • (34) Dump voltage upper limit (SCTF) (itv 51,52,56,57,58,59,60,24)\n
      • (35) J_winding pack/J_protection upper limit (SCTF) (itv 53,56,57,58,59,60,24)\n
      • (36) TF coil temperature margin lower limit (SCTF) (itv 54,55,56,57,58,59,60,24)\n
      • (37) Current drive gamma upper limit (itv 40,47)\n
      • (38) First wall coolant temperature rise upper limit (itv 62)\n
      • (39) First wall peak temperature upper limit (itv 63)\n
      • (40) Start-up injection power lower limit (PULSE) (itv 64)\n
      • (41) Plasma current ramp-up time lower limit (PULSE) (itv 66,65)\n
      • (42) Cycle time lower limit (PULSE) (itv 17,67,65)\n
      • (43) Average centrepost temperature\n (TART) (consistency equation) (itv 13,20,69,70)\n
      • (44) Peak centrepost temperature upper limit (TART) (itv 68,69,70)\n
      • (45) Edge safety factor lower limit (TART) (itv 71,1,2,3)\n
      • (46) Equation for Ip/Irod upper limit (TART) (itv 72,2,60)\n
      • (47) NOT USED\n
      • (48) Poloidal beta upper limit (itv 79,2,3,18)\n
      • (49) NOT USED\n
      • (50) IFE repetition rate upper limit (IFE)\n
      • (51) Startup volt-seconds consistency (PULSE) (itv 16,29,3,1)\n
      • (52) Tritium breeding ratio lower limit (itv 89,90,91)\n
      • (53) Neutron fluence on TF coil upper limit (itv 92,93,94)\n
      • (54) Peak TF coil nuclear heating upper limit (itv 95,93,94)\n
      • (55) Vacuum vessel helium concentration upper limit i_blanket_type =2 (itv 96,93,94)\n
      • (56) Pseparatrix/Rmajor upper limit (itv 97,1,3)\n
      • (57) NOT USED\n
      • (58) NOT USED\n
      • (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 )\n
      • (60) Central solenoid temperature margin lower limit (SCTF) (itv 106)\n
      • (61) Minimum availability value (itv 107)\n
      • (62) f_alpha_energy_confinement the ratio of particle to energy confinement times (itv 110)\n
      • (63) The number of ITER-like vacuum pumps niterpump < tfno (itv 111)\n
      • (64) Zeff less than or equal to zeffmax (itv 112)\n
      • (65) Dump time set by VV loads (itv 56, 113)\n
      • (66) Limit on rate of change of energy in poloidal field\n (Use iteration variable 65(t_current_ramp_up), 115)\n
      • (67) Simple Radiation Wall load limit (itv 116, 4,6)\n
      • (68) Psep * Bt / qAR upper limit (itv 117)\n
      • (69) ensure separatrix power = the value from Kallenbach divertor (itv 118)\n
      • (70) ensure that teomp = separatrix temperature in the pedestal profile,\n (itv 119 (tesep))\n
      • (71) ensure that neomp = separatrix density (nesep) x neratio\n
      • (72) central solenoid shear stress limit (Tresca yield criterion) (itv 123 foh_stress)\n
      • (73) Psep >= Plh + Paux (itv 137 (fplhsep))\n
      • (74) TFC quench < tmax_croco (itv 141 (fcqt))\n
      • (75) TFC current/copper area < Maximum (itv 143 f_coppera_m2)\n
      • (76) Eich critical separatrix density\n
      • (77) TF coil current per turn upper limit\n
      • (78) Reinke criterion impurity fraction lower limit (itv 147 freinke)\n
      • (79) Peak CS field upper limit (itv 149 fbmaxcs)\n
      • (80) Divertor power lower limit pdivt (itv 153 fpdivlim)\n
      • (81) Ne(0) > ne(ped) constraint (itv 154 fne0)\n
      • (82) toroidalgap > tftort constraint (itv 171 ftoroidalgap)\n
      • (83) Radial build consistency for stellarators (itv 172 f_avspace)\n
      • (84) Lower limit for beta (itv 173 fbeta_min)\n
      • (85) Constraint for CP lifetime\n
      • (86) Constraint for TF coil turn dimension\n
      • (87) Constraint for cryogenic power\n
      • (88) Constraint for TF coil strain absolute value\n
      • (89) Constraint for CS coil quench protection\n
      • (90) Checking if the design point is ECRH ignitable (itv 164 fecrh_ignition)
      \n\n\n\n", + "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)
        \n
        \n
      • ( 1) Beta (consistency equation) (itv 5)\n
      • ( 2) Global power balance (consistency equation) (itv 10,1,2,3,4,6,11)\n
      • ( 3) Ion power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
      • ( 4) Electron power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
      • ( 5) Density upper limit (itv 9,1,2,3,4,5,6)\n
      • ( 6) (Epsilon x beta poloidal) upper limit (itv 8,1,2,3,4,6)\n
      • ( 7) Beam ion density (NBI) (consistency equation) (itv 7)\n
      • ( 8) Neutron wall load upper limit (itv 14,1,2,3,4,6)\n
      • ( 9) Fusion power upper limit (itv 26,1,2,3,4,6)\n
      • (10) Toroidal field 1/R (consistency equation) (itv 12,1,2,3,13 )\n
      • (11) Radial build (consistency equation) (itv 3,1,13,16,29,42,61)\n
      • (12) Volt second lower limit (STEADY STATE) (itv 15,1,2,3)\n
      • (13) Burn time lower limit (PULSE) (itv 21,1,16,17,29,42,44,61)\n (itv 19,1,2,3,6)\n
      • (14) Neutral beam decay lengths to plasma centre (NBI) (consistency equation)\n
      • (15) LH power threshold limit (itv 103)\n
      • (16) Net electric power lower limit (itv 25,1,2,3)\n
      • (17) Radiation fraction upper limit (itv 28)\n
      • (18) Divertor heat load upper limit (itv 27)\n
      • (19) MVA upper limit (itv 30)\n
      • (20) Neutral beam tangency radius upper limit (NBI) (itv 33,31,3,13)\n
      • (21) Plasma minor radius lower limit (itv 32)\n
      • (22) Divertor collisionality upper limit (itv 34,43)\n
      • (23) Conducting shell to plasma minor radius ratio upper limit\n (itv 104,1,74)\n
      • (24) Beta upper limit (itv 36,1,2,3,4,6,18)\n
      • (25) Peak toroidal field upper limit (itv 35,3,13,29)\n
      • (26) Central solenoid EOF current density upper limit (i_pf_conductor=0)\n (itv 38,37,41,12)\n
      • (27) Central solenoid BOP current density upper limit (i_pf_conductor=0)\n (itv 39,37,41,12)\n
      • (28) Fusion gain Q lower limit (itv 45,47,40)\n
      • (29) Inboard radial build consistency (itv 3,1,13,16,29,42,61)\n
      • (30) Injection power upper limit (itv 46,47,11)\n
      • (31) TF coil case stress upper limit (SCTF) (itv 48,56,57,58,59,60,24)\n
      • (32) TF coil conduit stress upper limit (SCTF) (itv 49,56,57,58,59,60,24)\n
      • (33) I_op / I_critical (TF coil) (SCTF) (itv 50,56,57,58,59,60,24)\n
      • (34) Dump voltage upper limit (SCTF) (itv 51,52,56,57,58,59,60,24)\n
      • (35) J_winding pack/J_protection upper limit (SCTF) (itv 53,56,57,58,59,60,24)\n
      • (36) TF coil temperature margin lower limit (SCTF) (itv 54,55,56,57,58,59,60,24)\n
      • (37) Current drive gamma upper limit (itv 40,47)\n
      • (38) First wall coolant temperature rise upper limit (itv 62)\n
      • (39) First wall peak temperature upper limit (itv 63)\n
      • (40) Start-up injection power lower limit (PULSE) (itv 64)\n
      • (41) Plasma current ramp-up time lower limit (PULSE) (itv 66,65)\n
      • (42) Cycle time lower limit (PULSE) (itv 17,67,65)\n
      • (43) Average centrepost temperature\n (TART) (consistency equation) (itv 13,20,69,70)\n
      • (44) Peak centrepost temperature upper limit (TART) (itv 68,69,70)\n
      • (45) Edge safety factor lower limit (TART) (itv 71,1,2,3)\n
      • (46) Equation for Ip/Irod upper limit (TART) (itv 72,2,60)\n
      • (47) NOT USED\n
      • (48) Poloidal beta upper limit (itv 79,2,3,18)\n
      • (49) NOT USED\n
      • (50) IFE repetition rate upper limit (IFE)\n
      • (51) Startup volt-seconds consistency (PULSE) (itv 16,29,3,1)\n
      • (52) Tritium breeding ratio lower limit (itv 89,90,91)\n
      • (53) Neutron fluence on TF coil upper limit (itv 92,93,94)\n
      • (54) Peak TF coil nuclear heating upper limit (itv 95,93,94)\n
      • (55) Vacuum vessel helium concentration upper limit i_blanket_type =2 (itv 96,93,94)\n
      • (56) Pseparatrix/Rmajor upper limit (itv 97,1,3)\n
      • (57) NOT USED\n
      • (58) NOT USED\n
      • (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 )\n
      • (60) Central solenoid temperature margin lower limit (SCTF) (itv 106)\n
      • (61) Minimum availability value (itv 107)\n
      • (62) f_alpha_energy_confinement the ratio of particle to energy confinement times (itv 110)\n
      • (63) The number of ITER-like vacuum pumps niterpump < tfno (itv 111)\n
      • (64) Zeff less than or equal to zeffmax (itv 112)\n
      • (65) Dump time set by VV loads (itv 56, 113)\n
      • (66) Limit on rate of change of energy in poloidal field\n (Use iteration variable 65(t_current_ramp_up), 115)\n
      • (67) Simple Radiation Wall load limit (itv 116, 4,6)\n
      • (68) Psep * Bt / qAR upper limit (itv 117)\n
      • (69) ensure separatrix power = the value from Kallenbach divertor (itv 118)\n
      • (70) ensure that teomp = separatrix temperature in the pedestal profile,\n (itv 119 (tesep))\n
      • (71) ensure that neomp = separatrix density (nesep) x neratio\n
      • (72) central solenoid shear stress limit (Tresca yield criterion) (itv 123 foh_stress)\n
      • (73) Psep >= Plh + Paux (itv 137 (fplhsep))\n
      • (74) TFC quench < tmax_croco (itv 141 (fcqt))\n
      • (75) TFC current/copper area < Maximum (itv 143 f_coppera_m2)\n
      • (76) Eich critical separatrix density\n
      • (77) TF coil current per turn upper limit\n
      • (78) Reinke criterion impurity fraction lower limit (itv 147 freinke)\n
      • (79) Peak CS field upper limit (itv 149 fbmaxcs)\n
      • (80) Divertor power lower limit pdivt (itv 153 fpdivlim)\n
      • (81) Ne(0) > ne(ped) constraint (itv 154 fne0)\n
      • (82) toroidalgap > tftort constraint (itv 171 ftoroidalgap)\n
      • (83) Radial build consistency for stellarators (itv 172 f_avspace)\n
      • (84) Lower limit for beta (itv 173 fbeta_min)\n
      • (85) Constraint for CP lifetime\n
      • (86) Constraint for TF coil turn dimension\n
      • (87) Constraint for cryogenic power\n
      • (88) Constraint for TF coil strain absolute value\n
      • (89) Constraint for CS coil quench protection\n
      • (90) Checking if the design point is ECRH ignitable (itv 164 fecrh_ignition)
      \n\n\n\n", "lablmm": "lablmm(ipnfoms) : labels describing figures of merit:
        \n
        \n
      • ( 1) major radius\n
      • ( 2) not used\n
      • ( 3) neutron wall load\n
      • ( 4) P_tf + P_pf\n
      • ( 5) fusion gain Q\n
      • ( 6) cost of electricity\n
      • ( 7) capital cost (direct cost if ireactor=0,\n constructed cost otherwise)\n
      • ( 8) aspect ratio\n
      • ( 9) divertor heat load\n
      • (10) toroidal field\n
      • (11) total injected power\n
      • (12) hydrogen plant capital cost OBSOLETE\n
      • (13) hydrogen production rate OBSOLETE\n
      • (14) pulse length\n
      • (15) plant availability factor (N.B. requires\n iavail=1 to be set)\n
      • (16) linear combination of major radius (minimised) and pulse length (maximised)\n note: FoM should be minimised only!\n
      • (17) net electrical output\n
      • (18) Null Figure of Merit\n
      • (19) linear combination of big Q and pulse length (maximised)\n note: FoM should be minimised only!
      \n\n\n", "lablxc": "lablxc(ipnvars) : labels describing iteration variables
        \n
        \n
      • ( 1) aspect\n
      • ( 2) bt\n
      • ( 3) rmajor\n
      • ( 4) te\n
      • ( 5) beta\n
      • ( 6) dene\n
      • ( 7) f_nd_beam_electron\n
      • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
      • ( 9) fdene (f-value for equation 5)\n
      • (10) hfact\n
      • (11) pheat\n
      • (12) oacdcp\n
      • (13) dr_tf_inboard (NOT RECOMMENDED)\n
      • (14) fwalld (f-value for equation 8)\n
      • (15) fvs (f-value for equation 12)\n
      • (16) dr_cs\n
      • (17) tdwell\n
      • (18) q\n
      • (19) beam_energy\n
      • (20) temp_cp_average\n
      • (21) ftburn (f-value for equation 13)\n
      • (22) NOT USED\n
      • (23) fcoolcp\n
      • (24) NOT USED\n
      • (25) fpnetel (f-value for equation 16)\n
      • (26) ffuspow (f-value for equation 9)\n
      • (27) fhldiv (f-value for equation 18)\n
      • (28) fradpwr (f-value for equation 17), total radiation fraction\n
      • (29) dr_bore\n
      • (30) fmva (f-value for equation 19)\n
      • (31) gapomin\n
      • (32) frminor (f-value for equation 21)\n
      • (33) fportsz (f-value for equation 20)\n
      • (34) fdivcol (f-value for equation 22)\n
      • (35) fpeakb (f-value for equation 25)\n
      • (36) fbeta_max (f-value for equation 24)\n
      • (37) coheof\n
      • (38) fjohc (f-value for equation 26)\n
      • (39) fjohc0 (f-value for equation 27)\n
      • (40) fgamcd (f-value for equation 37)\n
      • (41) fcohbop\n
      • (42) dr_cs_tf_gap\n
      • (43) NOT USED\n
      • (44) fvsbrnni\n
      • (45) fqval (f-value for equation 28)\n
      • (46) fpinj (f-value for equation 30)\n
      • (47) feffcd\n
      • (48) fstrcase (f-value for equation 31)\n
      • (49) fstrcond (f-value for equation 32)\n
      • (50) fiooic (f-value for equation 33)\n
      • (51) fvdump (f-value for equation 34)\n
      • (52) vdalw\n
      • (53) fjprot (f-value for equation 35)\n
      • (54) ftmargtf (f-value for equation 36)\n
      • (55) NOT USED\n
      • (56) tdmptf\n
      • (57) thkcas\n
      • (58) thwcndut\n
      • (59) fcutfsu\n
      • (60) cpttf\n
      • (61) dr_shld_vv_gap_inboard\n
      • (62) fdtmp (f-value for equation 38)\n
      • (63) ftpeak (f-value for equation 39)\n
      • (64) fauxmn (f-value for equation 40)\n
      • (65) tohs\n
      • (66) ftohs (f-value for equation 41)\n
      • (67) ftcycl (f-value for equation 42)\n
      • (68) fptemp (f-value for equation 44)\n
      • (69) rcool\n
      • (70) vcool\n
      • (71) fq (f-value for equation 45)\n
      • (72) fipir (f-value for equation 46)\n
      • (73) dr_fw_plasma_gap_inboard\n
      • (74) dr_fw_plasma_gap_outboard\n
      • (75) tfootfi\n
      • (76) NOT USED\n
      • (77) NOT USED\n
      • (78) NOT USED\n
      • (79) fbeta_poloidal (f-value for equation 48)\n
      • (80) NOT USED\n
      • (81) edrive\n
      • (82) drveff\n
      • (83) tgain\n
      • (84) chrad\n
      • (85) pdrive\n
      • (86) frrmax (f-value for equation 50)\n
      • (87) NOT USED\n
      • (88) NOT USED\n
      • (89) ftbr (f-value for equation 52)\n
      • (90) blbuith\n
      • (91) blbuoth\n
      • (92) fflutf (f-value for equation 53)\n
      • (93) dr_shld_inboard\n
      • (94) dr_shld_outboard\n
      • (95) fptfnuc (f-value for equation 54)\n
      • (96) fvvhe (f-value for equation 55)\n
      • (97) fpsepr (f-value for equation 56)\n
      • (98) li6enrich\n
      • (99) NOT USED\n
      • (100) NOT USED\n
      • (101) NOT USED\n
      • (102) fimpvar\n
      • (103) fl_h_threshold (f-value for equation 15)\n
      • (104)fr_conducting_wall (f-value for equation 23)\n
      • (105) fnbshinef (f-value for equation 59)\n
      • (106) ftmargoh (f-value for equation 60)\n
      • (107) favail (f-value for equation 61)\n
      • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
      • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
      • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
      • (111) fniterpump: f-value for constraint that number\n
      • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
      • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
      • (114) len_fw_channel: Length of a single first wall channel\n
      • (115) fpoloidalpower: f-value for max rate of change of\n
      • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
      • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
      • (118) fpsep: f-value to ensure separatrix power is less than\n
      • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
      • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
      • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
      • (122) oh_steel_frac : streel fraction of Central Solenoid\n
      • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
      • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
      • (125) fimp(3) : Beryllium density fraction relative to electron density\n
      • (126) fimp(4) : Carbon density fraction relative to electron density\n
      • (127) fimp(5) : Nitrogen fraction relative to electron density\n
      • (128) fimp(6) : Oxygen density fraction relative to electron density\n
      • (129) fimp(7) : Neon density fraction relative to electron density\n
      • (130) fimp(8) : Silicon density fraction relative to electron density\n
      • (131) fimp(9) : Argon density fraction relative to electron density\n
      • (132) fimp(10) : Iron density fraction relative to electron density\n
      • (133) fimp(11) : Nickel density fraction relative to electron density\n
      • (134) fimp(12) : Krypton density fraction relative to electron density\n
      • (135) fimp(13) : Xenon density fraction relative to electron density\n
      • (136) fimp(14) : Tungsten density fraction relative to electron density\n
      • (137) fplhsep (f-value for equation 73)\n
      • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
      • (139) copper_thick : thickness of copper layer in tape (m)\n
      • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
      • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
      • (142) nesep : electron density at separatrix [m-3]\n
      • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
      • (144) fnesep : Eich critical electron density at separatrix\n
      • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
      • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
      • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
      • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
      • (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n
      • (152) fbmaxcs : Ratio of separatrix density to Greenwald density\n
      • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
      • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
      • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
      • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
      • (157) fvssu : F-value for available to required start up flux (con. 51)\n
      • (158) croco_thick : Thickness of CroCo copper tube (m)\n
      • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
      • (160) f_avspace (f-value for equation 83)\n
      • (161) fbeta_min (f-value for equation 84)\n
      • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
      • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
      • (164) f_crypmw : f-value for cryogenic plant power\n
      • (165) fstr_wp : f-value for TF coil strain absolute value\n
      • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
      • (167) fecrh_ignition: f-value for equation 90\n
      • (168) EMPTY : Description\n
      • (169) EMPTY : Description\n
      • (170) EMPTY : Description\n
      • (171) EMPTY : Description\n
      • (172) EMPTY : Description\n
      • (173) EMPTY : Description\n
      • (174) EMPTY : Description\n
      • (175) EMPTY : Description\n\n\n\n", "lablxc": "lablxc(ipnvars) : labels describing iteration variables
          \n
          \n
        • ( 1) aspect\n
        • ( 2) bt\n
        • ( 3) rmajor\n
        • ( 4) te\n
        • ( 5) beta\n
        • ( 6) dene\n
        • ( 7) f_nd_beam_electron\n
        • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
        • ( 9) fdene (f-value for equation 5)\n
        • (10) hfact\n
        • (11) pheat\n
        • (12) oacdcp\n
        • (13) dr_tf_inboard (NOT RECOMMENDED)\n
        • (14) fwalld (f-value for equation 8)\n
        • (15) fvs (f-value for equation 12)\n
        • (16) dr_cs\n
        • (17) t_between_pulse\n
        • (18) q\n
        • (19) beam_energy\n
        • (20) temp_cp_average\n
        • (21) ft_burn (f-value for equation 13)\n
        • (22) NOT USED\n
        • (23) fcoolcp\n
        • (24) NOT USED\n
        • (25) fpnetel (f-value for equation 16)\n
        • (26) ffuspow (f-value for equation 9)\n
        • (27) fhldiv (f-value for equation 18)\n
        • (28) fradpwr (f-value for equation 17), total radiation fraction\n
        • (29) dr_bore\n
        • (30) fmva (f-value for equation 19)\n
        • (31) gapomin\n
        • (32) frminor (f-value for equation 21)\n
        • (33) fportsz (f-value for equation 20)\n
        • (34) fdivcol (f-value for equation 22)\n
        • (35) fpeakb (f-value for equation 25)\n
        • (36) fbeta_max (f-value for equation 24)\n
        • (37) coheof\n
        • (38) fjohc (f-value for equation 26)\n
        • (39) fjohc0 (f-value for equation 27)\n
        • (40) fgamcd (f-value for equation 37)\n
        • (41) fcohbop\n
        • (42) dr_cs_tf_gap\n
        • (43) NOT USED\n
        • (44) fvsbrnni\n
        • (45) fqval (f-value for equation 28)\n
        • (46) fpinj (f-value for equation 30)\n
        • (47) feffcd\n
        • (48) fstrcase (f-value for equation 31)\n
        • (49) fstrcond (f-value for equation 32)\n
        • (50) fiooic (f-value for equation 33)\n
        • (51) fvdump (f-value for equation 34)\n
        • (52) vdalw\n
        • (53) fjprot (f-value for equation 35)\n
        • (54) ftmargtf (f-value for equation 36)\n
        • (55) NOT USED\n
        • (56) tdmptf\n
        • (57) thkcas\n
        • (58) thwcndut\n
        • (59) fcutfsu\n
        • (60) cpttf\n
        • (61) dr_shld_vv_gap_inboard\n
        • (62) fdtmp (f-value for equation 38)\n
        • (63) ftpeak (f-value for equation 39)\n
        • (64) fauxmn (f-value for equation 40)\n
        • (65) t_current_ramp_up\n
        • (66) ft_current_ramp_up (f-value for equation 41)\n
        • (67) ftcycl (f-value for equation 42)\n
        • (68) fptemp (f-value for equation 44)\n
        • (69) rcool\n
        • (70) vcool\n
        • (71) fq (f-value for equation 45)\n
        • (72) fipir (f-value for equation 46)\n
        • (73) dr_fw_plasma_gap_inboard\n
        • (74) dr_fw_plasma_gap_outboard\n
        • (75) tfootfi\n
        • (76) NOT USED\n
        • (77) NOT USED\n
        • (78) NOT USED\n
        • (79) fbetap (f-value for equation 48)\n
        • (80) NOT USED\n
        • (81) edrive\n
        • (82) drveff\n
        • (83) tgain\n
        • (84) chrad\n
        • (85) pdrive\n
        • (86) frrmax (f-value for equation 50)\n
        • (87) NOT USED\n
        • (88) NOT USED\n
        • (89) ftbr (f-value for equation 52)\n
        • (90) blbuith\n
        • (91) blbuoth\n
        • (92) fflutf (f-value for equation 53)\n
        • (93) dr_shld_inboard\n
        • (94) dr_shld_outboard\n
        • (95) fptfnuc (f-value for equation 54)\n
        • (96) fvvhe (f-value for equation 55)\n
        • (97) fpsepr (f-value for equation 56)\n
        • (98) li6enrich\n
        • (99) NOT USED\n
        • (100) NOT USED\n
        • (101) NOT USED\n
        • (102) fimpvar\n
        • (103) fl_h_threshold (f-value for equation 15)\n
        • (104)fr_conducting_wall (f-value for equation 23)\n
        • (105) fnbshinef (f-value for equation 59)\n
        • (106) ftmargoh (f-value for equation 60)\n
        • (107) favail (f-value for equation 61)\n
        • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
        • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
        • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
        • (111) fniterpump: f-value for constraint that number\n
        • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
        • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
        • (114) len_fw_channel: Length of a single first wall channel\n
        • (115) fpoloidalpower: f-value for max rate of change of\n
        • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
        • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
        • (118) fpsep: f-value to ensure separatrix power is less than\n
        • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
        • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
        • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
        • (122) oh_steel_frac : streel fraction of Central Solenoid\n
        • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
        • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
        • (125) fimp(3) : Beryllium density fraction relative to electron density\n
        • (126) fimp(4) : Carbon density fraction relative to electron density\n
        • (127) fimp(5) : Nitrogen fraction relative to electron density\n
        • (128) fimp(6) : Oxygen density fraction relative to electron density\n
        • (129) fimp(7) : Neon density fraction relative to electron density\n
        • (130) fimp(8) : Silicon density fraction relative to electron density\n
        • (131) fimp(9) : Argon density fraction relative to electron density\n
        • (132) fimp(10) : Iron density fraction relative to electron density\n
        • (133) fimp(11) : Nickel density fraction relative to electron density\n
        • (134) fimp(12) : Krypton density fraction relative to electron density\n
        • (135) fimp(13) : Xenon density fraction relative to electron density\n
        • (136) fimp(14) : Tungsten density fraction relative to electron density\n
        • (137) fplhsep (f-value for equation 73)\n
        • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
        • (139) copper_thick : thickness of copper layer in tape (m)\n
        • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
        • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
        • (142) nesep : electron density at separatrix [m-3]\n
        • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
        • (144) fnesep : Eich critical electron density at separatrix\n
        • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
        • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
        • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
        • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
        • (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n
        • (152) fbmaxcs : Ratio of separatrix density to Greenwald density\n
        • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
        • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
        • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
        • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
        • (157) fvssu : F-value for available to required start up flux (con. 51)\n
        • (158) croco_thick : Thickness of CroCo copper tube (m)\n
        • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
        • (160) f_avspace (f-value for equation 83)\n
        • (161) fbeta_min (f-value for equation 84)\n
        • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
        • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
        • (164) f_crypmw : f-value for cryogenic plant power\n
        • (165) fstr_wp : f-value for TF coil strain absolute value\n
        • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
        • (167) fecrh_ignition: f-value for equation 90\n
        • (168) EMPTY : Description\n
        • (169) EMPTY : Description\n
        • (170) EMPTY : Description\n
        • (171) EMPTY : Description\n
        • (172) EMPTY : Description\n
        • (173) EMPTY : Description\n
        • (174) EMPTY : Description\n
        • (175) EMPTY : Description\n\n\n\n", @@ -10265,7 +10265,7 @@ "pfbldgm3": "volume of PF coil power supply building (m3)", "pfcaseth": "steel case thickness for PF coil i (m)", "pfckts": "number of PF coil circuits", - "pfclres": "PF coil resistivity (if ipfres=1) (Ohm-m)", + "pfclres": "PF coil resistivity (if i_pf_conductor=1) (Ohm-m)", "pfmmax": "mass of heaviest PF coil (tonnes)", "pfrmax": "radius of largest PF coil (m)", "charged_particle_power": "charged particle fusion power (MW)", @@ -10630,7 +10630,7 @@ "sig_hoop": "", "sig_tf_case": "Maximum shear stress (Tresca criterion) in TF casing steel structures (Pa)", "sig_tf_case_max": "Allowable maximum shear stress (Tresca criterion) in TF coil case (Pa)", - "sig_tf_cs_bucked": "Maximum shear stress (Tresca criterion) in CS structures at CS flux swing [Pa]:\n
            \n
          • If superconducting CS (ipfres = 0): turn steel conduits stress
            • \n
          • If resistive CS (ipfres = 1): copper conductor stress
            • \n
          \nQuantity only computed for bucked and wedged design (`i_tf_bucking >= 2`)\n Def : CS Flux swing, instant when the current changes sign in CS (null current)", + "sig_tf_cs_bucked": "Maximum shear stress (Tresca criterion) in CS structures at CS flux swing [Pa]:\n
            \n
          • If superconducting CS (i_pf_conductor = 0): turn steel conduits stress
            • \n
          • If resistive CS (i_pf_conductor = 1): copper conductor stress
            • \n
          \nQuantity only computed for bucked and wedged design (`i_tf_bucking >= 2`)\n Def : CS Flux swing, instant when the current changes sign in CS (null current)", "sig_tf_r": "TF Inboard leg radial stress in steel r distribution at mid-plane [Pa]", "sig_tf_t": "TF Inboard leg tangential stress in steel r distribution at mid-plane [Pa]", "sig_tf_tresca": "TF Inboard leg maximum shear stress (Tresca criterion) in steel r distribution at mid-plane [Pa]", @@ -10639,8 +10639,8 @@ "sig_tf_wp_max": "Allowable maximum shear stress (Tresca criterion) in TF coil conduit (Pa)\nAllowable Tresca stress in TF coil structural material (Pa)", "sig_tf_z": "TF Inboard leg vertical tensile stress in steel at mid-plane [Pa]", "sigallpc": "allowable stress in CSpre-compression structure (Pa)", - "sigpfcalw": "maximum permissible tensile stress (MPa) in steel coil cases for superconducting\n PF coils (`ipfres=0`)", - "sigpfcf": "fraction of JxB hoop force supported by steel case for superconducting PF coils (`ipfres=0`)", + "sigpfcalw": "maximum permissible tensile stress (MPa) in steel coil cases for superconducting\n PF coils (`i_pf_conductor=0`)", + "sigpfcf": "fraction of JxB hoop force supported by steel case for superconducting PF coils (`i_pf_conductor=0`)", "sigvvall": "allowable stress from TF quench in vacuum vessel (Pa)", "single": "", "skind": "", @@ -13437,7 +13437,7 @@ "lb": 0, "ub": 3 }, - "ipfres": { + "i_pf_conductor": { "lb": 0, "ub": 1 }, @@ -18949,7 +18949,7 @@ "fcupfsu", "fvssu", "i_pf_location", - "ipfres", + "i_pf_conductor", "itr_sum", "i_cs_superconductor", "i_pf_superconductor", @@ -20473,7 +20473,7 @@ "iotabar": "real_variable", "ipedestal": "int_variable", "i_pf_location": "int_array", - "ipfres": "int_variable", + "i_pf_conductor": "int_variable", "ipnet": "int_variable", "ipowerflow": "int_variable", "i_cs_precomp": "int_variable", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 8538834cb2..40590883d0 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -90,7 +90,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "rpf", np.full(22, 0.0)) monkeypatch.setattr(pfv, "zref", [3.6, 1.2, 2.5, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0]) monkeypatch.setattr(pfv, "pfmmax", 0.0) - monkeypatch.setattr(pfv, "ipfres", 0) + monkeypatch.setattr(pfv, "i_pf_conductor", 0) monkeypatch.setattr(pfv, "alfapf", 5.0e-10) monkeypatch.setattr(pfv, "ncirt", 8) monkeypatch.setattr(pfv, "pfclres", 2.5e-8) @@ -210,7 +210,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "bmaxoh0", 1.4e1) monkeypatch.setattr(pfv, "rjohc", 4.070e7) monkeypatch.setattr(pfv, "tmargoh", 1.5) - monkeypatch.setattr(pfv, "ipfres", 0) + monkeypatch.setattr(pfv, "i_pf_conductor", 0) monkeypatch.setattr(pfv, "rjpfalw", np.full(22, 0.0)) monkeypatch.setattr(pfv, "pfclres", 2.8e-8) monkeypatch.setattr(pfv, "vf", np.full(22, 0.3)) diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index b70ffedc39..83b481ff76 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -292,7 +292,7 @@ ohhghf = 0.9 * Central solenoid height / TF coil internal height oh_steel_frac = 0.4856940627014451 * central solenoid steel fraction (`iteration variable 122`) rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * average winding pack current density of PF coil i (A/m2) at time of peak rpf2 = -1.825 * offset (m) of radial position of `i_pf_location=2` PF coils from being at -sigpfcf = 0.666 * fraction of JxB hoop force supported by steel case for superconducting PF coils (`ipfres=0`) +sigpfcf = 0.666 * fraction of JxB hoop force supported by steel case for superconducting PF coils (`i_pf_conductor=0`) zref(1) = 3.6 zref(2) = 1.2 zref(3) = 1.0 diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index ef04afc05b..48193718e9 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1627,7 +1627,7 @@ itartpf = 1 * DESCRIPTION: Switch for Spherical Tokamak PF models (1: Use regular model) * JUSTIFICATION: Use the regular model instead rather than Peng & Strickler (1986) -ipfres = 0 +i_pf_conductor = 0 * DESCRIPTION: Switch for PF coil type (default = 0) * =0 superconducting PF coils DOES THIS SET THE PF AND CS? * =1 resistive PF coils @@ -1840,7 +1840,7 @@ i_pf_superconductor = 9 * JUSTIFICATION: Design choice, superconducting PF coils *pfclres = -* DESCRIPTION: PF coil resistivity (if ipfres=1) (Ohm-m) +* DESCRIPTION: PF coil resistivity (if i_pf_conductor=1) (Ohm-m) * JUSTIFICATION: Not used, superconducting PF coil *vf = @@ -1862,12 +1862,12 @@ i_pf_superconductor = 9 *sigpfcalw = * DESCRIPTION: maximum permissible tensile stress (MPa) in steel coil cases for superconducting -* PF coils (ipfres=0) (default = 500) +* PF coils (i_pf_conductor=0) (default = 500) * JUSTIFICATION: Not yet set *sigpfcf = * DESCRIPTION: fraction of JxB hoop force supported by steel case for superconducting PF -*coils (`ipfres=0`) (default = 0.66) +*coils (`i_pf_conductor=0`) (default = 0.66) * JUSTIFICATION: Not yet set diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 78bab4fc5e..68f40111d3 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -2026,7 +2026,7 @@ class Acc2222Param(NamedTuple): j_crit_str_pf: Any = None - ipfres: Any = None + i_pf_conductor: Any = None vfohc: Any = None @@ -2129,7 +2129,7 @@ class Acc2222Param(NamedTuple): supercond_cost_model=0, j_crit_str_cs=100.0, j_crit_str_pf=200.0, - ipfres=0, + i_pf_conductor=0, vfohc=0.29999999999999999, nohc=7, turns=np.array( @@ -2325,7 +2325,7 @@ class Acc2222Param(NamedTuple): supercond_cost_model=0, j_crit_str_cs=100.0, j_crit_str_pf=200.0, - ipfres=0, + i_pf_conductor=0, vfohc=0.29999999999999999, nohc=7, turns=np.array( @@ -2521,7 +2521,7 @@ class Acc2222Param(NamedTuple): supercond_cost_model=1, j_crit_str_cs=100.0, j_crit_str_pf=200.0, - ipfres=0, + i_pf_conductor=0, vfohc=0.29999999999999999, nohc=7, turns=np.array( @@ -2715,7 +2715,7 @@ def test_acc2222(acc2222param, monkeypatch, costs): monkeypatch.setattr(pfcoil_variables, "j_crit_str_pf", acc2222param.j_crit_str_pf) - monkeypatch.setattr(pfcoil_variables, "ipfres", acc2222param.ipfres) + monkeypatch.setattr(pfcoil_variables, "i_pf_conductor", acc2222param.i_pf_conductor) monkeypatch.setattr(pfcoil_variables, "vfohc", acc2222param.vfohc) diff --git a/tests/unit/test_pulse.py b/tests/unit/test_pulse.py index 07338c579d..923b4b8655 100644 --- a/tests/unit/test_pulse.py +++ b/tests/unit/test_pulse.py @@ -32,7 +32,7 @@ class TohswgParam(NamedTuple): ncirt: Any = None - ipfres: Any = None + i_pf_conductor: Any = None nohc: Any = None @@ -100,7 +100,7 @@ class BurnParam(NamedTuple): t_current_ramp_up_min=0, vpfskv=0, ncirt=8, - ipfres=0, + i_pf_conductor=0, nohc=7, powohres=0, sxlg=np.array( @@ -658,7 +658,7 @@ class BurnParam(NamedTuple): t_current_ramp_up_min=-526.67247746645455, vpfskv=20, ncirt=8, - ipfres=0, + i_pf_conductor=0, nohc=7, powohres=0, sxlg=np.array( @@ -1235,7 +1235,7 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): monkeypatch.setattr(pfcoil_variables, "ncirt", tohswgparam.ncirt) - monkeypatch.setattr(pfcoil_variables, "ipfres", tohswgparam.ipfres) + monkeypatch.setattr(pfcoil_variables, "i_pf_conductor", tohswgparam.i_pf_conductor) monkeypatch.setattr(pfcoil_variables, "nohc", tohswgparam.nohc) diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 22f9806195..2d08a33c71 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -3571,7 +3571,7 @@ class StressclParam(NamedTuple): n_tf_wp_layers: Any = None - ipfres: Any = None + i_pf_conductor: Any = None oh_steel_frac: Any = None @@ -3697,7 +3697,7 @@ class StressclParam(NamedTuple): fcutfsu=0.80884, str_wp=0, n_tf_wp_layers=5, - ipfres=0, + i_pf_conductor=0, oh_steel_frac=0.57874999999999999, ohhghf=0.90000000000000002, coheof=20726000, @@ -3820,7 +3820,7 @@ class StressclParam(NamedTuple): fcutfsu=0.80884, str_wp=0.0015619754370069119, n_tf_wp_layers=5, - ipfres=0, + i_pf_conductor=0, oh_steel_frac=0.57874999999999999, ohhghf=0.90000000000000002, coheof=20726000, @@ -3946,7 +3946,7 @@ def test_stresscl(stressclparam, monkeypatch, sctfcoil): stressclparam.tf_in_cs, stressclparam.dr_tf_inboard, stressclparam.dr_cs_tf_gap, - stressclparam.ipfres, + stressclparam.i_pf_conductor, stressclparam.coheof, stressclparam.cohbop, stressclparam.cptdin, diff --git a/tests/unit/test_structure.py b/tests/unit/test_structure.py index af7a70dd29..2c69e66097 100644 --- a/tests/unit/test_structure.py +++ b/tests/unit/test_structure.py @@ -34,7 +34,7 @@ def test_structure(self, structure): coolmass: float = 1199.6389920083477 dewmass: float = 16426726.727684354 i_tf_sup: int = 1 - ipfres: int = 0 + i_pf_conductor: int = 0 expected_fncmass: float = 310716.52923547616 expected_aintmass: float = 5829865.436088617 @@ -49,7 +49,7 @@ def test_structure(self, structure): akappa, b0, i_tf_sup, - ipfres, + i_pf_conductor, tf_h_width, tfhmax, shldmass, From e26195f2a45a328d686411627a80a9c161486029 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 13:22:28 +0000 Subject: [PATCH 07/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'rohc'=20to=20'r?= =?UTF-8?q?=5Fcs=5Fmiddle'=20across=20multiple=20files=20for=20consistency?= =?UTF-8?q?=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- documentation/proc-pages/eng-models/pf-coil.md | 2 +- process/pfcoil.py | 16 ++++++++-------- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/integration/test_pfcoil_int.py | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/documentation/proc-pages/eng-models/pf-coil.md b/documentation/proc-pages/eng-models/pf-coil.md index d4c60556fe..17f9c6c7da 100644 --- a/documentation/proc-pages/eng-models/pf-coil.md +++ b/documentation/proc-pages/eng-models/pf-coil.md @@ -28,7 +28,7 @@ The three possible values of `i_pf_location(j)` correspond to the following PF c into account `i_single_null` and other recent changes e.g. rclsnorm) `i_pf_location(j)` = 1: PF coils are placed above the central solenoid (one group only); -*R* = `rohc` + `rpf1`
          +*R* = `r_cs_middle` + `rpf1`
          *Z* = $\pm$(`hmax` * `ohhghf` + 0.1 + 0.5 * (`hmax` * (1 - `ohhghf`) + `dr_tf_inboard` + 0.1)) `i_pf_location(j)` = 2: PF coils are placed above the TF coils (one group only);
          diff --git a/process/pfcoil.py b/process/pfcoil.py index 497cc31b75..8cbd6a14f6 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -128,7 +128,7 @@ def pfcoil(self): # First break up Central Solenoid solenoid into 'filaments' # Central Solenoid mean radius - pfv.rohc = bv.dr_bore + 0.5e0 * bv.dr_cs + pfv.r_cs_middle = bv.dr_bore + 0.5e0 * bv.dr_cs # nfxf is the total no of filaments into which the Central Solenoid is split, # if present @@ -149,7 +149,7 @@ def pfcoil(self): # Symmetric up/down Central Solenoid : Find (R,Z) and current of each filament at BOP for nng in range(pfv.nfxfh): - pf.rfxf[nng] = pfv.rohc + pf.rfxf[nng] = pfv.r_cs_middle pf.rfxf[nng + pfv.nfxfh] = pf.rfxf[nng] pf.zfxf[nng] = bv.hmax * pfv.ohhghf / pfv.nfxfh * ((nng + 1) - 0.5e0) pf.zfxf[nng + pfv.nfxfh] = -pf.zfxf[nng] @@ -168,7 +168,7 @@ def pfcoil(self): if pfv.i_pf_location[j] == 1: # PF coil is stacked on top of the Central Solenoid for k in range(pfv.ncls[j]): - pf.rcls[j, k] = pfv.rohc + pfv.rpf1 + pf.rcls[j, k] = pfv.r_cs_middle + pfv.rpf1 # Z coordinate of coil enforced so as not # to occupy the same space as the Central Solenoid @@ -988,11 +988,11 @@ def ohcalc(self): pfv.zl[pfv.nohc - 1] = -pfv.zh[pfv.nohc - 1] # (R,Z) coordinates of coil centre - pfv.rpf[pfv.nohc - 1] = pfv.rohc + pfv.rpf[pfv.nohc - 1] = pfv.r_cs_middle pfv.zpf[pfv.nohc - 1] = 0.0e0 # Radius of outer edge - pfv.rb[pfv.nohc - 1] = pfv.rohc + 0.5e0 * bv.dr_cs + pfv.rb[pfv.nohc - 1] = pfv.r_cs_middle + 0.5e0 * bv.dr_cs # Radius of inner edge pfv.ra[pfv.nohc - 1] = pfv.rb[pfv.nohc - 1] - bv.dr_cs @@ -1222,7 +1222,7 @@ def ohcalc(self): pfv.powohres = ( 2.0e0 * constants.pi - * pfv.rohc + * pfv.r_cs_middle * pfv.pfclres / (pfv.areaoh * (1.0e0 - pfv.vfohc)) * (1.0e6 * pfv.ric[pfv.nohc - 1]) ** 2 @@ -1661,7 +1661,7 @@ def induct(self, output): zoh = np.zeros(noh) if bv.iohcl != 0: - roh[:] = pfv.rohc + roh[:] = pfv.r_cs_middle delzoh = ( 2.0e0 * pfv.zh[pfv.nohc - 1] / noh @@ -1744,7 +1744,7 @@ def induct(self, output): if bv.iohcl != 0: # Central Solenoid self inductance - a = pfv.rohc # mean radius of coil + a = pfv.r_cs_middle # mean radius of coil b = 2.0e0 * pfv.zh[pfv.nohc - 1] # length of coil c = pfv.rb[pfv.nohc - 1] - pfv.ra[pfv.nohc - 1] # radial winding thickness pfv.sxlg[pfv.nohc - 1, pfv.nohc - 1] = self.selfinductance( diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 9208159f92..31e1fc1de3 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -271,7 +271,7 @@ module pfcoil_variables real(dp), dimension(ngc2) :: rjpfalw !! allowable winding pack current density of PF coil i (A/m2) - real(dp) :: rohc + real(dp) :: r_cs_middle !! radius to the centre of the central solenoid (m) real(dp) :: routr @@ -482,7 +482,7 @@ subroutine init_pfcoil_variables rjohc = 0.0D0 rjohc0 = 0.0D0 rjpfalw = 0.0D0 - rohc = 0.0D0 + r_cs_middle = 0.0D0 routr = 1.5D0 rpf = 0.0D0 rpf1 = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index eb95346df6..1e0d38edb7 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -4252,7 +4252,7 @@ "robotics_h": 30.0, "robotics_l": 50.0, "robotics_w": 30.0, - "rohc": 0.0, + "r_cs_middle": 0.0, "roughness": 1e-06, "routr": 1.5, "row": 4.0, @@ -10559,7 +10559,7 @@ "robotics_h": "robotics buildings length, width, height (m)", "robotics_l": "robotics buildings length, width, height (m)", "robotics_w": "robotics buildings length, width, height (m)", - "rohc": "radius to the centre of the central solenoid (m)", + "r_cs_middle": "radius to the centre of the central solenoid (m)", "roughness": "first wall channel roughness epsilon (m)", "routr": "radial distance (m) from outboard TF coil leg to centre of `i_pf_location=3` PF coils", "row": "clearance to building wall for crane operation (m)", @@ -18980,7 +18980,7 @@ "rjohc", "rjohc0", "rjpfalw", - "rohc", + "r_cs_middle", "routr", "rpf", "rpf1", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 40590883d0..18bdfbd548 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -64,7 +64,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "fcohbop", 1.0) monkeypatch.setattr(pfv, "rjconpf", np.full(22, 1.1e7)) monkeypatch.setattr(pfv, "ngrp", 4) - monkeypatch.setattr(pfv, "rohc", 3.0) + monkeypatch.setattr(pfv, "r_cs_middle", 3.0) monkeypatch.setattr(pfv, "ncls", np.array([1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0])) monkeypatch.setattr(pfv, "zpf", np.full(22, 0.0)) monkeypatch.setattr(pfv, "cptdin", np.full(22, 4.22e4)) @@ -193,7 +193,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "bmaxoh", 1.4e1) monkeypatch.setattr(pfv, "i_cs_stress", 0) monkeypatch.setattr(pfv, "coheof", 1.693e7) - monkeypatch.setattr(pfv, "rohc", 3.0) + monkeypatch.setattr(pfv, "r_cs_middle", 3.0) monkeypatch.setattr(pfv, "vfohc", 3.0e-1) monkeypatch.setattr(pfv, "jcableoh_bop", 1.069e8) monkeypatch.setattr(pfv, "fcuohsu", 7.000e-1) @@ -2862,7 +2862,7 @@ def test_induct(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): ]), ) monkeypatch.setattr(pfv, "sxlg", np.ones((22, 22), dtype=int)) - monkeypatch.setattr(pfv, "rohc", 2.6084100000000001) + monkeypatch.setattr(pfv, "r_cs_middle", 2.6084100000000001) monkeypatch.setattr(pfv, "ngrp", 4) monkeypatch.setattr(pfv, "ncls", np.array([1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0])) monkeypatch.setattr( From 88a170e75fe70da1e8b6db57e46e21c2f543ef9b Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 13:29:08 +0000 Subject: [PATCH 08/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'ra'=20to=20'r=5F?= =?UTF-8?q?pf=5Fcoil=5Finner'=20across=20multiple=20files=20for=20consiste?= =?UTF-8?q?ncy=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 40 +++++++++++++++------------- source/fortran/pfcoil_variables.f90 | 4 +-- tests/integration/ref_dicts.json | 6 ++--- tests/integration/test_pfcoil_int.py | 10 +++---- tests/unit/test_pfcoil.py | 2 +- 5 files changed, 33 insertions(+), 29 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index 8cbd6a14f6..740540ef1e 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -547,10 +547,10 @@ def pfcoil(self): pfv.rjconpf[i] = 1.0e6 * abs(pfv.ric[i]) / area # Location of edges of each coil: - # ra = inner radius, rb = outer radius + # r_pf_coil_inner = inner radius, rb = outer radius # zl = 'lower' edge z (i.e. edge nearer to midplane) # zh = 'upper' edge z (i.e. edge further from midplane) - pfv.ra[i] = pfv.rpf[i] - dx + pfv.r_pf_coil_inner[i] = pfv.rpf[i] - dx pfv.rb[i] = pfv.rpf[i] + dx pfv.zl[i] = pfv.zpf[i] - dz @@ -575,7 +575,7 @@ def pfcoil(self): dx = 0.5e0 * math.sqrt(area) # square cross-section - pfv.ra[i] = pfv.rpf[i] - dx + pfv.r_pf_coil_inner[i] = pfv.rpf[i] - dx pfv.rb[i] = pfv.rpf[i] + dx pfv.zl[i] = pfv.zpf[i] - dx @@ -690,7 +690,7 @@ def pfcoil(self): # Thickness found via a simple quadratic equation drpdz = ( - pfv.rb[i] - pfv.ra[i] + abs(pfv.zh[i] - pfv.zl[i]) + pfv.rb[i] - pfv.r_pf_coil_inner[i] + abs(pfv.zh[i] - pfv.zl[i]) ) # dr + dz pfv.pfcaseth[i] = 0.25e0 * ( -drpdz + math.sqrt(drpdz * drpdz + 4.0e0 * areaspf) @@ -743,7 +743,7 @@ def pfcoil(self): # Plasma size and shape pfv.zh[pfv.nohc] = pv.rminor * pv.kappa pfv.zl[pfv.nohc] = -pv.rminor * pv.kappa - pfv.ra[pfv.nohc] = pv.rmajor - pv.rminor + pfv.r_pf_coil_inner[pfv.nohc] = pv.rmajor - pv.rminor pfv.rb[pfv.nohc] = pv.rmajor + pv.rminor pfv.turns[pfv.nohc] = 1.0e0 @@ -995,7 +995,7 @@ def ohcalc(self): pfv.rb[pfv.nohc - 1] = pfv.r_cs_middle + 0.5e0 * bv.dr_cs # Radius of inner edge - pfv.ra[pfv.nohc - 1] = pfv.rb[pfv.nohc - 1] - bv.dr_cs + pfv.r_pf_coil_inner[pfv.nohc - 1] = pfv.rb[pfv.nohc - 1] - bv.dr_cs # Total cross-sectional area pfv.areaoh = 2.0e0 * hohc * bv.dr_cs @@ -1051,7 +1051,7 @@ def ohcalc(self): # Peak field due to central Solenoid itself bmaxoh2 = self.bfmax( pfv.coheof, - pfv.ra[pfv.nohc - 1], + pfv.r_pf_coil_inner[pfv.nohc - 1], pfv.rb[pfv.nohc - 1], hohc, ) @@ -1070,7 +1070,7 @@ def ohcalc(self): # Occurs at inner edge of coil; bmaxoh0 and bzi are of same sign at BOP pfv.bmaxoh0 = self.bfmax( pfv.cohbop, - pfv.ra[pfv.nohc - 1], + pfv.r_pf_coil_inner[pfv.nohc - 1], pfv.rb[pfv.nohc - 1], hohc, ) @@ -1088,7 +1088,7 @@ def ohcalc(self): # Superconducting coil # New calculation from M. N. Wilson for hoop stress - pf.sig_hoop = self.hoop_stress(pfv.ra[pfv.nohc - 1]) + pf.sig_hoop = self.hoop_stress(pfv.r_pf_coil_inner[pfv.nohc - 1]) # New calculation from Y. Iwasa for axial stress pf.sig_axial, pf.axial_force = self.axial_stress() @@ -1340,7 +1340,7 @@ def peakb(self, i, ii, it): pf.rfxf[:kk], pf.zfxf[:kk], pf.cfxf[:kk], - pfv.ra[i - 1], + pfv.r_pf_coil_inner[i - 1], pfv.zpf[i - 1], ) pf.xind[:kk], bro, bzo, psi = bfield( @@ -1493,7 +1493,7 @@ def hoop_stress(self, r): :return: hoop stress (MPa) :rtype: float """ - a = pfv.ra[pfv.nohc - 1] + a = pfv.r_pf_coil_inner[pfv.nohc - 1] # Outer radius of central Solenoid [m] b = pfv.rb[pfv.nohc - 1] @@ -1596,7 +1596,9 @@ def axial_stress(self): axial_force = axial_term_1 * (axial_term_2 - axial_term_3) # axial area [m2] - area_ax = constants.pi * (pfv.rb[pfv.nohc - 1] ** 2 - pfv.ra[pfv.nohc - 1] ** 2) + area_ax = constants.pi * ( + pfv.rb[pfv.nohc - 1] ** 2 - pfv.r_pf_coil_inner[pfv.nohc - 1] ** 2 + ) # calculate unsmeared axial stress [MPa] s_axial = axial_force / (pfv.oh_steel_frac * 0.5 * area_ax) @@ -1640,7 +1642,7 @@ def induct(self, output): math.ceil( 2.0e0 * pfv.zh[pfv.nohc - 1] - / (pfv.rb[pfv.nohc - 1] - pfv.ra[pfv.nohc - 1]) + / (pfv.rb[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]) ) ) @@ -1746,7 +1748,9 @@ def induct(self, output): # Central Solenoid self inductance a = pfv.r_cs_middle # mean radius of coil b = 2.0e0 * pfv.zh[pfv.nohc - 1] # length of coil - c = pfv.rb[pfv.nohc - 1] - pfv.ra[pfv.nohc - 1] # radial winding thickness + c = ( + pfv.rb[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1] + ) # radial winding thickness pfv.sxlg[pfv.nohc - 1, pfv.nohc - 1] = self.selfinductance( a, b, c, pfv.turns[pfv.nohc - 1] ) @@ -2325,7 +2329,7 @@ def outpf(self): for k in range(pf.nef): op.write( self.outfile, - f"PF {k}\t\t\t{pfv.rpf[k]:.2e}\t{pfv.zpf[k]:.2e}\t{pfv.rb[k] - pfv.ra[k]:.2e}\t{abs(pfv.zh[k] - pfv.zl[k]):.2e}\t{pfv.turns[k]:.2e}", + f"PF {k}\t\t\t{pfv.rpf[k]:.2e}\t{pfv.zpf[k]:.2e}\t{pfv.rb[k] - pfv.r_pf_coil_inner[k]:.2e}\t{abs(pfv.zh[k] - pfv.zl[k]):.2e}\t{pfv.turns[k]:.2e}", ) for k in range(pf.nef): @@ -2345,7 +2349,7 @@ def outpf(self): self.mfile, f"PF coil {k} radial thickness (m)", f"(pfdr({k}))", - pfv.rb[k] - pfv.ra[k], + pfv.rb[k] - pfv.r_pf_coil_inner[k], ) op.ovarre( self.mfile, @@ -2377,7 +2381,7 @@ def outpf(self): if bv.iohcl != 0: op.write( self.outfile, - f"CS\t\t\t\t{pfv.rpf[pfv.nohc - 1]:.2e}\t{pfv.zpf[pfv.nohc - 1]:.2e}\t{pfv.rb[pfv.nohc - 1] - pfv.ra[pfv.nohc - 1]:.2e}\t{abs(pfv.zh[pfv.nohc - 1] - pfv.zl[pfv.nohc - 1]):.2e}\t{pfv.turns[pfv.nohc - 1]:.2e}\t{pfv.pfcaseth[pfv.nohc - 1]:.2e}", + f"CS\t\t\t\t{pfv.rpf[pfv.nohc - 1]:.2e}\t{pfv.zpf[pfv.nohc - 1]:.2e}\t{pfv.rb[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]:.2e}\t{abs(pfv.zh[pfv.nohc - 1] - pfv.zl[pfv.nohc - 1]):.2e}\t{pfv.turns[pfv.nohc - 1]:.2e}\t{pfv.pfcaseth[pfv.nohc - 1]:.2e}", ) op.ovarre( self.mfile, @@ -2395,7 +2399,7 @@ def outpf(self): self.mfile, "Central solenoid radial thickness (m)", "(ohdr)", - (pfv.rb[pfv.nohc - 1] - pfv.ra[pfv.nohc - 1]), + (pfv.rb[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]), ) op.ovarre( self.mfile, diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 31e1fc1de3..4e141e6f54 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -249,7 +249,7 @@ module pfcoil_variables real(dp) :: powpfres !! total PF coil resistive losses during flattop (W) - real(dp), dimension(ngc2) :: ra + real(dp), dimension(ngc2) :: r_pf_coil_inner !! inner radius of coil i (m) real(dp), dimension(ngc2) :: rb @@ -472,7 +472,7 @@ subroutine init_pfcoil_variables pfwpmw = 0.0D0 powohres = 0.0D0 powpfres = 0.0D0 - ra = 0.0D0 + r_pf_coil_inner = 0.0D0 rb = 0.0D0 ric = 0.0D0 rjconpf = (/3.0D7, 3.0D7, 3.0D7, & diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 1e0d38edb7..37a488acef 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3742,7 +3742,7 @@ "r_wp_centre": 0.0, "r_wp_inner": 0.0, "r_wp_outer": 0.0, - "ra": 0.0, + "r_pf_coil_inner": 0.0, "rad": "pi/180.0_wp_", "rad_fraction_LCFS": 0.0, "rad_fraction_sol": 0.8, @@ -10472,7 +10472,7 @@ "r_wp_centre": "Radial position of centre and centre of winding pack [m]", "r_wp_inner": "Radial position of inner edge and centre of winding pack [m]", "r_wp_outer": "Radial position of outer edge and centre of winding pack [m]", - "ra": "inner radius of coil i (m)", + "r_pf_coil_inner": "inner radius of coil i (m)", "rad": "", "rad_fraction_LCFS": "", "rad_fraction_sol": "SoL radiation fraction", @@ -18973,7 +18973,7 @@ "pfwpmw", "powohres", "powpfres", - "ra", + "r_pf_coil_inner", "rb", "ric", "rjconpf", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 18bdfbd548..64ee491b68 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -101,7 +101,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "coheof", 1.6932e7) monkeypatch.setattr(pfv, "zh", np.full(22, 0.0)) monkeypatch.setattr(pfv, "fcohbof", 2.654e-1) - monkeypatch.setattr(pfv, "ra", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "r_pf_coil_inner", np.full(22, 0.0)) monkeypatch.setattr(pfv, "rb", np.full(22, 0.0)) monkeypatch.setattr(pfv, "i_pf_superconductor", 3) monkeypatch.setattr(pfv, "i_cs_superconductor", 1) @@ -219,7 +219,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "jscoh_eof", 4.758e8) monkeypatch.setattr(pfv, "zpf", np.full(22, 0.0)) monkeypatch.setattr(pfv, "rb", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "ra", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "r_pf_coil_inner", np.full(22, 0.0)) monkeypatch.setattr(pfv, "jscoh_bop", 3.562e8) monkeypatch.setattr(pfv, "cptdin", np.full(22, 4.22e4)) monkeypatch.setattr(pfv, "pfcaseth", np.full(22, 0.0)) @@ -2217,7 +2217,7 @@ def test_peakb(monkeypatch: pytest.MonkeyPatch, pfcoil: PFCoil): ) monkeypatch.setattr( pfv, - "ra", + "r_pf_coil_inner", np.array([ 5.6944236847973242, 5.5985055619292972, @@ -2643,7 +2643,7 @@ def test_axial_stress(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): ) monkeypatch.setattr( pfv, - "ra", + "r_pf_coil_inner", np.array([ 5.6944236847973242, 5.5985055619292972, @@ -2896,7 +2896,7 @@ def test_induct(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): monkeypatch.setattr(pfv, "ncirt", 8) monkeypatch.setattr( pfv, - "ra", + "r_pf_coil_inner", np.array([ 5.6944236847973242, 5.5985055619292972, diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index 0b787c4abb..8382e438cc 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -2010,7 +2010,7 @@ def test_hoop_stress(pfcoil, monkeypatch): ) monkeypatch.setattr( pfv, - "ra", + "r_pf_coil_inner", np.array([ 5.6944236847973242, 5.5985055619292972, From 55e0e480fd3d7c8bd0416c864d2df09fda2bda36 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 13:34:09 +0000 Subject: [PATCH 09/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'rpf'=20to=20'r?= =?UTF-8?q?=5Fpf=5Fcoil=5Fmiddle'=20across=20multiple=20files=20for=20cons?= =?UTF-8?q?istency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 14 +- examples/data/large_tokamak_1_MFILE.DAT | 14 +- examples/data/large_tokamak_2_MFILE.DAT | 14 +- examples/data/large_tokamak_3_MFILE.DAT | 14 +- examples/data/large_tokamak_4_MFILE.DAT | 14 +- examples/data/scan_MFILE.DAT | 126 +++++------ process/costs.py | 8 +- process/io/plot_proc.py | 6 +- process/pfcoil.py | 89 +++++--- process/power.py | 2 +- source/fortran/pfcoil_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 14 +- .../data/large_tokamak_2_MFILE.DAT | 14 +- .../data/large_tokamak_3_MFILE.DAT | 14 +- .../data/large_tokamak_4_MFILE.DAT | 14 +- .../integration/data/large_tokamak_MFILE.DAT | 14 +- tests/integration/data/scan_2D_MFILE.DAT | 210 +++++++++--------- tests/integration/data/scan_MFILE.DAT | 126 +++++------ tests/integration/ref_dicts.json | 6 +- tests/integration/test_pfcoil_int.py | 8 +- tests/unit/data/large_tokamak_MFILE.DAT | 14 +- tests/unit/test_costs_1990.py | 12 +- tests/unit/test_power.py | 10 +- 23 files changed, 392 insertions(+), 369 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index d0b40ad621..51eeba6492 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -821,49 +821,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3091E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2994E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2994E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6436E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8574E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6228E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0543E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3991E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3991E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.3830E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1532E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1259E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6706E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6706E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1273E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1273E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9061E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6244E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6246E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6706E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6706E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1273E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1273E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9061E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6244E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6246E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5180E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5180E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0922E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0922E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3097E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2388E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5758E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5180E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5180E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0922E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0922E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3097E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2388E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5758E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.3365E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3365E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5551E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 335705eeb4..2ca2fbbc46 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -816,49 +816,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6731E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6731E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5209E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5209E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.2734E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index f94b9d0c4d..ab6500ba41 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -816,49 +816,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6731E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6731E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5209E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5209E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.2734E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 8691452642..41c7e565a7 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -816,49 +816,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6731E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6731E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5209E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5209E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.2734E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 68bf0da713..8fcd0084c7 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -816,49 +816,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6731E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6731E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5209E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5209E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.2734E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 1737909d5f..93dc387777 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -652,49 +652,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_01_radius_(m)___________________________________________________ (rpf(01))_____________________ 6.4763E+00 + PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 - PF_coil_02_radius_(m)___________________________________________________ (rpf(02))_____________________ 6.4763E+00 + PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 - PF_coil_03_radius_(m)___________________________________________________ (rpf(03))_____________________ 1.9032E+01 + PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 - PF_coil_04_radius_(m)___________________________________________________ (rpf(04))_____________________ 1.9032E+01 + PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 - PF_coil_05_radius_(m)___________________________________________________ (rpf(05))_____________________ 1.7386E+01 + PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 - PF_coil_06_radius_(m)___________________________________________________ (rpf(06))_____________________ 1.7386E+01 + PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf(nohc))___________________ 2.6164E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 @@ -1647,49 +1647,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_01_radius_(m)___________________________________________________ (rpf(01))_____________________ 6.4763E+00 + PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 - PF_coil_02_radius_(m)___________________________________________________ (rpf(02))_____________________ 6.4763E+00 + PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 - PF_coil_03_radius_(m)___________________________________________________ (rpf(03))_____________________ 1.9032E+01 + PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 - PF_coil_04_radius_(m)___________________________________________________ (rpf(04))_____________________ 1.9032E+01 + PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 - PF_coil_05_radius_(m)___________________________________________________ (rpf(05))_____________________ 1.7386E+01 + PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 - PF_coil_06_radius_(m)___________________________________________________ (rpf(06))_____________________ 1.7386E+01 + PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf(nohc))___________________ 2.6164E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 @@ -2642,49 +2642,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_01_radius_(m)___________________________________________________ (rpf(01))_____________________ 6.4763E+00 + PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 - PF_coil_02_radius_(m)___________________________________________________ (rpf(02))_____________________ 6.4763E+00 + PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 - PF_coil_03_radius_(m)___________________________________________________ (rpf(03))_____________________ 1.9032E+01 + PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 - PF_coil_04_radius_(m)___________________________________________________ (rpf(04))_____________________ 1.9032E+01 + PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 - PF_coil_05_radius_(m)___________________________________________________ (rpf(05))_____________________ 1.7386E+01 + PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 - PF_coil_06_radius_(m)___________________________________________________ (rpf(06))_____________________ 1.7386E+01 + PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf(nohc))___________________ 2.6164E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 @@ -3637,49 +3637,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_01_radius_(m)___________________________________________________ (rpf(01))_____________________ 6.4763E+00 + PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 - PF_coil_02_radius_(m)___________________________________________________ (rpf(02))_____________________ 6.4763E+00 + PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 - PF_coil_03_radius_(m)___________________________________________________ (rpf(03))_____________________ 1.9032E+01 + PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 - PF_coil_04_radius_(m)___________________________________________________ (rpf(04))_____________________ 1.9032E+01 + PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 - PF_coil_05_radius_(m)___________________________________________________ (rpf(05))_____________________ 1.7386E+01 + PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 - PF_coil_06_radius_(m)___________________________________________________ (rpf(06))_____________________ 1.7386E+01 + PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf(nohc))___________________ 2.6164E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 @@ -4632,49 +4632,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_01_radius_(m)___________________________________________________ (rpf(01))_____________________ 6.4763E+00 + PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 - PF_coil_02_radius_(m)___________________________________________________ (rpf(02))_____________________ 6.4763E+00 + PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 - PF_coil_03_radius_(m)___________________________________________________ (rpf(03))_____________________ 1.9032E+01 + PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 - PF_coil_04_radius_(m)___________________________________________________ (rpf(04))_____________________ 1.9032E+01 + PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 - PF_coil_05_radius_(m)___________________________________________________ (rpf(05))_____________________ 1.7386E+01 + PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 - PF_coil_06_radius_(m)___________________________________________________ (rpf(06))_____________________ 1.7386E+01 + PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf(nohc))___________________ 2.6164E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 @@ -5627,49 +5627,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_01_radius_(m)___________________________________________________ (rpf(01))_____________________ 6.4763E+00 + PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 - PF_coil_02_radius_(m)___________________________________________________ (rpf(02))_____________________ 6.4763E+00 + PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 - PF_coil_03_radius_(m)___________________________________________________ (rpf(03))_____________________ 1.9032E+01 + PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 - PF_coil_04_radius_(m)___________________________________________________ (rpf(04))_____________________ 1.9032E+01 + PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 - PF_coil_05_radius_(m)___________________________________________________ (rpf(05))_____________________ 1.7386E+01 + PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 - PF_coil_06_radius_(m)___________________________________________________ (rpf(06))_____________________ 1.7386E+01 + PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf(nohc))___________________ 2.6164E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 @@ -6622,49 +6622,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_01_radius_(m)___________________________________________________ (rpf(01))_____________________ 6.4763E+00 + PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 - PF_coil_02_radius_(m)___________________________________________________ (rpf(02))_____________________ 6.4763E+00 + PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 - PF_coil_03_radius_(m)___________________________________________________ (rpf(03))_____________________ 1.9032E+01 + PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 - PF_coil_04_radius_(m)___________________________________________________ (rpf(04))_____________________ 1.9032E+01 + PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 - PF_coil_05_radius_(m)___________________________________________________ (rpf(05))_____________________ 1.7386E+01 + PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 - PF_coil_06_radius_(m)___________________________________________________ (rpf(06))_____________________ 1.7386E+01 + PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf(nohc))___________________ 2.6164E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 @@ -7617,49 +7617,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_01_radius_(m)___________________________________________________ (rpf(01))_____________________ 6.4763E+00 + PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 - PF_coil_02_radius_(m)___________________________________________________ (rpf(02))_____________________ 6.4763E+00 + PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 - PF_coil_03_radius_(m)___________________________________________________ (rpf(03))_____________________ 1.9032E+01 + PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 - PF_coil_04_radius_(m)___________________________________________________ (rpf(04))_____________________ 1.9032E+01 + PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 - PF_coil_05_radius_(m)___________________________________________________ (rpf(05))_____________________ 1.7386E+01 + PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 - PF_coil_06_radius_(m)___________________________________________________ (rpf(06))_____________________ 1.7386E+01 + PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf(nohc))___________________ 2.6164E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 @@ -8612,49 +8612,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_01_radius_(m)___________________________________________________ (rpf(01))_____________________ 6.4763E+00 + PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 - PF_coil_02_radius_(m)___________________________________________________ (rpf(02))_____________________ 6.4763E+00 + PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 - PF_coil_03_radius_(m)___________________________________________________ (rpf(03))_____________________ 1.9032E+01 + PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 - PF_coil_04_radius_(m)___________________________________________________ (rpf(04))_____________________ 1.9032E+01 + PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 - PF_coil_05_radius_(m)___________________________________________________ (rpf(05))_____________________ 1.7386E+01 + PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 - PF_coil_06_radius_(m)___________________________________________________ (rpf(06))_____________________ 1.7386E+01 + PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf(nohc))___________________ 2.6164E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 diff --git a/process/costs.py b/process/costs.py index eb10e4790f..c731443b8a 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1556,7 +1556,9 @@ def acc2222(self): for i in range(pfcoil_variables.nohc): pfwndl = ( pfwndl - + constants.twopi * pfcoil_variables.rpf[i] * pfcoil_variables.turns[i] + + constants.twopi + * pfcoil_variables.r_pf_coil_middle[i] + * pfcoil_variables.turns[i] ) # Account 222.2.1 : Conductor @@ -1643,7 +1645,7 @@ def acc2222(self): self.c22221 = self.c22221 + ( 1.0e-6 * constants.twopi - * pfcoil_variables.rpf[i] + * pfcoil_variables.r_pf_coil_middle[i] * pfcoil_variables.turns[i] * cpfconpm ) @@ -1715,7 +1717,7 @@ def acc2222(self): self.c22221 = self.c22221 + ( 1.0e-6 * constants.twopi - * pfcoil_variables.rpf[pfcoil_variables.nohc - 1] + * pfcoil_variables.r_pf_coil_middle[pfcoil_variables.nohc - 1] * pfcoil_variables.turns[pfcoil_variables.nohc - 1] * cpfconpm ) diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 2bc73259af..2e9a07b073 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2189,7 +2189,7 @@ def plot_pf_coils(axis, mfile_data, scan, colour_scheme): # Number of coils, both PF and CS number_of_coils = 0 for item in mfile_data.data: - if "rpf[" in item: + if "r_pf_coil_middle[" in item: number_of_coils += 1 # Check for Central Solenoid @@ -2200,7 +2200,7 @@ def plot_pf_coils(axis, mfile_data, scan, colour_scheme): noc = number_of_coils - 1 if iohcl == 1 else number_of_coils for coil in range(noc): - coils_r.append(mfile_data.data[f"rpf[{coil:01}]"].get_scan(scan)) + coils_r.append(mfile_data.data[f"r_pf_coil_middle[{coil:01}]"].get_scan(scan)) coils_z.append(mfile_data.data[f"zpf[{coil:01}]"].get_scan(scan)) coils_dr.append(mfile_data.data[f"pfdr({coil:01})"].get_scan(scan)) coils_dz.append(mfile_data.data[f"pfdz({coil:01})"].get_scan(scan)) @@ -2583,7 +2583,7 @@ def plot_magnetics_info(axis, mfile_data, scan): # Number of coils (1 is OH coil) number_of_coils = 0 for item in mfile_data.data: - if "rpf[" in item: + if "r_pf_coil_middle[" in item: number_of_coils += 1 pf_info = [ diff --git a/process/pfcoil.py b/process/pfcoil.py index 740540ef1e..a0439d9246 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -480,7 +480,7 @@ def pfcoil(self): ncl = 0 for nng in range(pfv.ngrp): for ng2 in range(pfv.ncls[nng]): - pfv.rpf[ncl] = pf.rcls[nng, ng2] + pfv.r_pf_coil_middle[ncl] = pf.rcls[nng, ng2] pfv.zpf[ncl] = pf.zcls[nng, ng2] # Currents at different times: @@ -550,8 +550,8 @@ def pfcoil(self): # r_pf_coil_inner = inner radius, rb = outer radius # zl = 'lower' edge z (i.e. edge nearer to midplane) # zh = 'upper' edge z (i.e. edge further from midplane) - pfv.r_pf_coil_inner[i] = pfv.rpf[i] - dx - pfv.rb[i] = pfv.rpf[i] + dx + pfv.r_pf_coil_inner[i] = pfv.r_pf_coil_middle[i] - dx + pfv.rb[i] = pfv.r_pf_coil_middle[i] + dx pfv.zl[i] = pfv.zpf[i] - dz if pfv.zpf[i] < 0.0e0: @@ -575,8 +575,8 @@ def pfcoil(self): dx = 0.5e0 * math.sqrt(area) # square cross-section - pfv.r_pf_coil_inner[i] = pfv.rpf[i] - dx - pfv.rb[i] = pfv.rpf[i] + dx + pfv.r_pf_coil_inner[i] = pfv.r_pf_coil_middle[i] - dx + pfv.rb[i] = pfv.r_pf_coil_middle[i] + dx pfv.zl[i] = pfv.zpf[i] - dx if pfv.zpf[i] < 0.0e0: @@ -636,7 +636,7 @@ def pfcoil(self): # Length of conductor - rll = 2.0e0 * constants.pi * pfv.rpf[i] * pfv.turns[i] + rll = 2.0e0 * constants.pi * pfv.r_pf_coil_middle[i] * pfv.turns[i] # Resistive coils @@ -670,7 +670,10 @@ def pfcoil(self): # (J x B) force on coil forcepf = ( - 0.5e6 * (pfv.bpf[i] + pf.bpf2[i]) * abs(pfv.ric[i]) * pfv.rpf[i] + 0.5e6 + * (pfv.bpf[i] + pf.bpf2[i]) + * abs(pfv.ric[i]) + * pfv.r_pf_coil_middle[i] ) # Stress ==> cross-sectional area of supporting steel to use @@ -702,7 +705,13 @@ def pfcoil(self): # Weight of steel case - pfv.wts[i] = areaspf * 2.0e0 * constants.pi * pfv.rpf[i] * fwbsv.denstl + pfv.wts[i] = ( + areaspf + * 2.0e0 + * constants.pi + * pfv.r_pf_coil_middle[i] + * fwbsv.denstl + ) # Mass of heaviest PF coil (tonnes) @@ -717,7 +726,9 @@ def pfcoil(self): pfv.itr_sum = 0.0e0 for m in range(pfv.ngrp): for _n in range(pfv.ncls[m]): - pfv.itr_sum = pfv.itr_sum + (pfv.rpf[c] * pfv.turns[c] * pfv.cptdin[c]) + pfv.itr_sum = pfv.itr_sum + ( + pfv.r_pf_coil_middle[c] * pfv.turns[c] * pfv.cptdin[c] + ) c = c + 1 pfv.itr_sum = pfv.itr_sum + ( @@ -897,11 +908,11 @@ def tf_pf_collision_detector(self): for ii in range(pfv.ngrp): for ij in range(pfv.ncls[ii]): if pf.rcls[ii, ij] <= ( # Outboard TF coil collision - pf.rclsnorm - pfv.routr + pfv.rpf[i] + pf.rclsnorm - pfv.routr + pfv.r_pf_coil_middle[i] ) and pf.rcls[ii, ij] >= ( bv.r_tf_outboard_mid - (0.5 * bv.dr_tf_outboard) - - pfv.rpf[i] + - pfv.r_pf_coil_middle[i] ): pf_tf_collision += 1 if pf.rcls[ii, ij] <= ( # Inboard TF coil collision @@ -910,19 +921,21 @@ def tf_pf_collision_detector(self): + bv.dr_cs_precomp + bv.dr_cs_tf_gap + bv.dr_tf_inboard - + pfv.rpf[i] + + pfv.r_pf_coil_middle[i] ) and pf.rcls[ii, ij] >= ( bv.dr_bore + bv.dr_cs + bv.dr_cs_precomp + bv.dr_cs_tf_gap - - pfv.rpf[i] + - pfv.r_pf_coil_middle[i] ): pf_tf_collision += 1 if ( # Vertical TF coil collision - abs(pf.zcls[ii, ij]) <= bv.hpfu + pfv.rpf[i] + abs(pf.zcls[ii, ij]) <= bv.hpfu + pfv.r_pf_coil_middle[i] and abs(pf.zcls[ii, ij]) - >= bv.hpfu - (0.5 * bv.dr_tf_outboard) - pfv.rpf[i] + >= bv.hpfu + - (0.5 * bv.dr_tf_outboard) + - pfv.r_pf_coil_middle[i] ): pf_tf_collision += 1 @@ -988,7 +1001,7 @@ def ohcalc(self): pfv.zl[pfv.nohc - 1] = -pfv.zh[pfv.nohc - 1] # (R,Z) coordinates of coil centre - pfv.rpf[pfv.nohc - 1] = pfv.r_cs_middle + pfv.r_pf_coil_middle[pfv.nohc - 1] = pfv.r_cs_middle pfv.zpf[pfv.nohc - 1] = 0.0e0 # Radius of outer edge @@ -1138,7 +1151,11 @@ def ohcalc(self): # Weight of steel pfv.wts[pfv.nohc - 1] = ( - areaspf * 2.0e0 * constants.pi * pfv.rpf[pfv.nohc - 1] * fwbsv.denstl + areaspf + * 2.0e0 + * constants.pi + * pfv.r_pf_coil_middle[pfv.nohc - 1] + * fwbsv.denstl ) # Non-steel cross-sectional area @@ -1158,7 +1175,7 @@ def ohcalc(self): * (1.0e0 - pfv.vfohc) * 2.0e0 * constants.pi - * pfv.rpf[pfv.nohc - 1] + * pfv.r_pf_coil_middle[pfv.nohc - 1] * tfv.dcond[pfv.i_cs_superconductor - 1] ) else: @@ -1167,7 +1184,7 @@ def ohcalc(self): * (1.0e0 - pfv.vfohc) * 2.0e0 * constants.pi - * pfv.rpf[pfv.nohc - 1] + * pfv.r_pf_coil_middle[pfv.nohc - 1] * constants.dcopper ) @@ -1294,25 +1311,25 @@ def peakb(self, i, ii, it): kk = kk + 1 dzpf = pfv.zh[jj - 1] - pfv.zl[jj - 1] - pf.rfxf[kk - 1] = pfv.rpf[jj - 1] + pf.rfxf[kk - 1] = pfv.r_pf_coil_middle[jj - 1] pf.zfxf[kk - 1] = pfv.zpf[jj - 1] + dzpf * 0.125e0 pf.cfxf[kk - 1] = ( pfv.ric[jj - 1] * pfv.waves[jj - 1, it - 1] * 0.25e6 ) kk = kk + 1 - pf.rfxf[kk - 1] = pfv.rpf[jj - 1] + pf.rfxf[kk - 1] = pfv.r_pf_coil_middle[jj - 1] pf.zfxf[kk - 1] = pfv.zpf[jj - 1] + dzpf * 0.375e0 pf.cfxf[kk - 1] = ( pfv.ric[jj - 1] * pfv.waves[jj - 1, it - 1] * 0.25e6 ) kk = kk + 1 - pf.rfxf[kk - 1] = pfv.rpf[jj - 1] + pf.rfxf[kk - 1] = pfv.r_pf_coil_middle[jj - 1] pf.zfxf[kk - 1] = pfv.zpf[jj - 1] - dzpf * 0.125e0 pf.cfxf[kk - 1] = ( pfv.ric[jj - 1] * pfv.waves[jj - 1, it - 1] * 0.25e6 ) kk = kk + 1 - pf.rfxf[kk - 1] = pfv.rpf[jj - 1] + pf.rfxf[kk - 1] = pfv.r_pf_coil_middle[jj - 1] pf.zfxf[kk - 1] = pfv.zpf[jj - 1] - dzpf * 0.375e0 pf.cfxf[kk - 1] = ( pfv.ric[jj - 1] * pfv.waves[jj - 1, it - 1] * 0.25e6 @@ -1321,7 +1338,7 @@ def peakb(self, i, ii, it): else: # Field from different coil kk = kk + 1 - pf.rfxf[kk - 1] = pfv.rpf[jj - 1] + pf.rfxf[kk - 1] = pfv.r_pf_coil_middle[jj - 1] pf.zfxf[kk - 1] = pfv.zpf[jj - 1] pf.cfxf[kk - 1] = ( pfv.ric[jj - 1] * pfv.waves[jj - 1, it - 1] * 1.0e6 @@ -1729,7 +1746,7 @@ def induct(self, output): for i in range(pfv.ngrp): xpfpl = 0.0 ncoils = ncoils + pfv.ncls[i] - rp = pfv.rpf[ncoils - 1] + rp = pfv.r_pf_coil_middle[ncoils - 1] zp = pfv.zpf[ncoils - 1] xc, br, bz, psi = bfield(rc, zc, cc, rp, zp) for ii in range(nplas): @@ -1764,7 +1781,7 @@ def induct(self, output): for i in range(pfv.ngrp): xohpf = 0.0 ncoils = ncoils + pfv.ncls[i] - rp = pfv.rpf[ncoils - 1] + rp = pfv.r_pf_coil_middle[ncoils - 1] zp = pfv.zpf[ncoils - 1] xc, br, bz, psi = bfield(rc, zc, cc, rp, zp) for ii in range(noh): @@ -1790,9 +1807,9 @@ def induct(self, output): jj = j + 1 + 1 if j >= i else j + 1 zc[j] = pfv.zpf[jj - 1] - rc[j] = pfv.rpf[jj - 1] + rc[j] = pfv.r_pf_coil_middle[jj - 1] - rp = pfv.rpf[i] + rp = pfv.r_pf_coil_middle[i] zp = pfv.zpf[i] xc, br, bz, psi = bfield(rc, zc, cc, rp, zp) for k in range(pf.nef): @@ -1803,8 +1820,8 @@ def induct(self, output): pfv.sxlg[k, k] = ( constants.rmu0 * pfv.turns[k] ** 2 - * pfv.rpf[k] - * (math.log(8.0e0 * pfv.rpf[k] / rl) - 1.75e0) + * pfv.r_pf_coil_middle[k] + * (math.log(8.0e0 * pfv.r_pf_coil_middle[k] / rl) - 1.75e0) ) else: pfv.sxlg[i, k] = xc[k - 1] * pfv.turns[k] * pfv.turns[i] @@ -2329,15 +2346,15 @@ def outpf(self): for k in range(pf.nef): op.write( self.outfile, - f"PF {k}\t\t\t{pfv.rpf[k]:.2e}\t{pfv.zpf[k]:.2e}\t{pfv.rb[k] - pfv.r_pf_coil_inner[k]:.2e}\t{abs(pfv.zh[k] - pfv.zl[k]):.2e}\t{pfv.turns[k]:.2e}", + f"PF {k}\t\t\t{pfv.r_pf_coil_middle[k]:.2e}\t{pfv.zpf[k]:.2e}\t{pfv.rb[k] - pfv.r_pf_coil_inner[k]:.2e}\t{abs(pfv.zh[k] - pfv.zl[k]):.2e}\t{pfv.turns[k]:.2e}", ) for k in range(pf.nef): op.ovarre( self.mfile, f"PF coil {k} radius (m)", - f"(rpf[{k}])", - pfv.rpf[k], + f"(r_pf_coil_middle[{k}])", + pfv.r_pf_coil_middle[k], ) op.ovarre( self.mfile, @@ -2381,13 +2398,13 @@ def outpf(self): if bv.iohcl != 0: op.write( self.outfile, - f"CS\t\t\t\t{pfv.rpf[pfv.nohc - 1]:.2e}\t{pfv.zpf[pfv.nohc - 1]:.2e}\t{pfv.rb[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]:.2e}\t{abs(pfv.zh[pfv.nohc - 1] - pfv.zl[pfv.nohc - 1]):.2e}\t{pfv.turns[pfv.nohc - 1]:.2e}\t{pfv.pfcaseth[pfv.nohc - 1]:.2e}", + f"CS\t\t\t\t{pfv.r_pf_coil_middle[pfv.nohc - 1]:.2e}\t{pfv.zpf[pfv.nohc - 1]:.2e}\t{pfv.rb[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]:.2e}\t{abs(pfv.zh[pfv.nohc - 1] - pfv.zl[pfv.nohc - 1]):.2e}\t{pfv.turns[pfv.nohc - 1]:.2e}\t{pfv.pfcaseth[pfv.nohc - 1]:.2e}", ) op.ovarre( self.mfile, "Central solenoid radius (m)", - "(rpf[nohc-1])", - pfv.rpf[pfv.nohc - 1], + "(r_pf_coil_middle[nohc-1])", + pfv.r_pf_coil_middle[pfv.nohc - 1], ) op.ovarre( self.mfile, diff --git a/process/power.py b/process/power.py index 450960d07b..ee25e6a709 100644 --- a/process/power.py +++ b/process/power.py @@ -118,7 +118,7 @@ def pfpwr(self, output: bool): pfcoil_variables.pfclres * 2.0e0 * np.pi - * pfcoil_variables.rpf[ic] + * pfcoil_variables.r_pf_coil_middle[ic] * abs( pfcoil_variables.rjconpf[ic] / ( diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 4e141e6f54..80dabf0e5c 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -277,7 +277,7 @@ module pfcoil_variables real(dp) :: routr !! radial distance (m) from outboard TF coil leg to centre of `i_pf_location=3` PF coils - real(dp), dimension(ngc2) :: rpf + real(dp), dimension(ngc2) :: r_pf_coil_middle !! radius of PF coil i (m) real(dp) :: rpf1 @@ -484,7 +484,7 @@ subroutine init_pfcoil_variables rjpfalw = 0.0D0 r_cs_middle = 0.0D0 routr = 1.5D0 - rpf = 0.0D0 + r_pf_coil_middle = 0.0D0 rpf1 = 0.0D0 rpf2 = -1.63D0 rref = (/7.0D0, 7.0D0, 7.0D0, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 32b039f03d..69aebfc0d9 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -815,49 +815,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6731E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6731E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5209E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5209E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.2734E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 5642bd42a5..e5bb1bd2ea 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -816,49 +816,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6731E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6731E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5209E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5209E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.2734E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 4cee716c2d..d6ddceb508 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -816,49 +816,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6731E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6731E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5209E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5209E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.2734E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 9dbde6b835..14b090ccff 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -816,49 +816,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6731E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6731E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5209E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5209E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.2734E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 0361e4f5e7..5693f31b02 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -819,49 +819,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 1.0000E+00 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3738E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2662E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2662E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4091E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7637E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.1628E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0608E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3575E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3575E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.0673E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0269E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6276E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6738E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6738E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1326E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1326E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9242E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6968E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6370E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6738E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6738E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1326E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1326E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9242E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6968E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6370E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5216E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5216E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0591E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0591E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.2990E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.1960E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5683E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5216E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5216E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0591E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0591E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.2990E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.1960E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5683E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.2588E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2588E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7696E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index d0429af690..4a49c7e7a2 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -817,49 +817,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3191E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2937E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2937E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6029E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8411E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.5784E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0553E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3925E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3925E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.3326E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1330E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.0768E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6710E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6710E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1276E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1276E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9072E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6289E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6218E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6710E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6710E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1276E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1276E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9072E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6289E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6218E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5185E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5185E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0862E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0862E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3077E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2309E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5692E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5185E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5185E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0862E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0862E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3077E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2309E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5692E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.3263E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3263E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5540E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 @@ -1980,49 +1980,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3025E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3022E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3022E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6633E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8653E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6865E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0536E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4030E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4030E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4133E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1653E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1946E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6702E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6702E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1278E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1278E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9080E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6320E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6226E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6702E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6702E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1278E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1278E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9080E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6320E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6226E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5176E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5176E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1075E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1075E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3146E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2585E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5753E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5176E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5176E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1075E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1075E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3146E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2585E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5753E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.3448E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3448E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5277E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 @@ -3143,49 +3143,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.2890E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3092E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3092E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.7137E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8855E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7779E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0523E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4117E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4117E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4806E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1923E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2939E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6695E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6695E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1277E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1277E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9075E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6299E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6223E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6695E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6695E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1277E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1277E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9075E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6299E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6223E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5168E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5168E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1222E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1222E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3194E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2776E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5793E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5168E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5168E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1222E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1222E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3194E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2776E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5793E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.3583E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3583E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5352E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 @@ -4306,49 +4306,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.2904E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3091E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3091E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.7129E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8852E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7987E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0524E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4119E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4119E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4823E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1929E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.3157E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6695E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6695E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1276E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1276E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9072E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6289E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6217E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6695E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6695E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1276E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1276E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9072E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6289E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6217E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5169E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5169E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1200E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1200E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3187E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2748E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5786E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5169E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5169E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1200E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1200E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3187E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2748E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5786E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.3569E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3569E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5349E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 @@ -5469,49 +5469,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3025E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3027E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3027E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6670E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8668E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7021E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0536E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4038E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4038E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4193E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1677E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2112E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6702E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6702E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1287E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1287E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9110E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6438E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6247E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6702E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6702E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1287E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1287E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9110E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6438E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6247E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5176E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5176E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1138E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1138E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3167E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2667E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5777E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5176E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5176E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1138E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1138E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3167E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2667E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5777E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.3448E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3448E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5266E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 @@ -6632,49 +6632,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3197E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2942E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2942E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6062E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8425E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.5872E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0554E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3932E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3932E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.3377E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1351E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.0866E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6710E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6710E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1288E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1288E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9112E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6450E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6249E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6710E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6710E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1288E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1288E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9112E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6450E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6249E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5185E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5185E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0957E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0957E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3108E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2432E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5729E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5185E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5185E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0957E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0957E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3108E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2432E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5729E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.3304E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3304E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4639E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 @@ -7795,49 +7795,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3214E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2941E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2941E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6053E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8421E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6058E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0555E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3933E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3933E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.3389E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1356E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1061E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6711E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6711E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1288E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1288E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9113E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6453E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6246E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6711E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6711E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1288E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1288E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9113E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6453E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6246E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5186E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5186E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0942E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0942E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3103E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2413E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5724E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5186E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5186E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0942E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0942E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3103E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2413E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5724E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.3294E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3294E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4494E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 @@ -8958,49 +8958,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3066E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3013E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3013E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6568E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8627E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7117E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0541E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4025E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4025E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4094E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1638E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2208E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6704E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6704E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1281E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1281E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9089E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6357E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6226E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6704E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6704E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1281E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1281E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9089E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6357E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6226E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5178E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5178E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1059E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1059E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3141E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2565E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5749E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5178E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5178E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1059E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1059E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3141E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2565E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5749E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.3439E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3439E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4622E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 @@ -10121,49 +10121,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.2927E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3076E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3076E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.7019E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8808E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.8179E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0527E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4108E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4108E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4731E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1892E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.3356E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6696E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6696E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1265E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1265E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9035E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6140E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6179E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6696E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6696E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1265E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1265E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9035E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6140E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6179E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5170E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5170E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1109E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1109E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3157E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2629E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5747E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5170E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5170E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1109E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1109E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3157E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2629E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5747E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.3578E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3578E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4724E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 @@ -11284,49 +11284,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.2934E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3081E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3081E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.7053E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8821E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.8302E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0527E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4114E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4114E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4783E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1913E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.3487E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6697E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6697E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1274E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1274E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9066E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6263E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6202E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6697E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6697E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1274E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1274E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9066E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6263E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6202E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5171E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5171E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1164E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1164E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3175E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2700E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5770E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5171E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5171E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1164E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1164E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3175E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2700E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5770E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.3570E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3570E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4720E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 @@ -12447,49 +12447,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3075E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3023E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3023E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6640E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8656E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7247E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0541E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4037E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4037E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4184E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1674E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2346E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6704E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6704E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1294E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1294E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9134E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6535E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6262E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6704E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6704E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1294E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1294E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9134E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6535E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6262E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5179E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5179E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1140E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1140E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3167E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2670E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5783E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5179E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5179E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1140E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1140E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3167E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2670E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5783E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.3426E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3426E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4697E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 @@ -13610,49 +13610,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3220E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2960E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2960E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6187E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8475E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6307E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0556E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3956E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3956E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.3561E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1424E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1325E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6712E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6712E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1302E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1302E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9159E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6635E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6284E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6712E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6712E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1302E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1302E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9159E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6635E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6284E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5187E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5187E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1029E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1029E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3131E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2525E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5762E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5187E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5187E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1029E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1029E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3131E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2525E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5762E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.3286E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3286E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4537E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 @@ -14773,49 +14773,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3230E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2964E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2964E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6216E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8486E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6451E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0557E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3962E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3962E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.3608E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1443E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1478E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6712E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6712E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1309E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1309E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9184E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6735E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6303E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6712E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6712E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1309E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1309E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9184E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6735E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6303E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5187E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5187E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1069E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1069E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3145E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2578E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5780E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5187E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5187E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1069E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1069E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3145E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2578E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5780E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.3276E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3276E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4535E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 @@ -15936,49 +15936,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3081E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3038E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3038E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6745E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8698E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7386E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0542E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4053E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4053E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4312E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1725E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2496E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6704E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6704E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1310E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1310E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9188E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6753E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6307E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6704E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6704E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1310E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1310E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9188E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6753E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6307E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5179E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5179E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1247E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1247E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3202E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2808E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5828E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5179E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5179E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1247E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1247E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3202E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2808E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5828E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.3422E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3422E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4673E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 @@ -17099,49 +17099,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.2932E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3112E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3112E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.7279E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8912E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.8313E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0527E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4145E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4145E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.5024E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.2010E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.3506E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6697E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6697E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1312E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1312E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9193E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6773E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6312E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6697E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6697E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1312E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1312E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9193E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6773E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6312E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5170E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5170E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1430E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1430E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3262E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.3046E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5879E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5170E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5170E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1430E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1430E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3262E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.3046E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5879E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.3568E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3568E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4798E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index bcc2b662b8..dd8a25a50f 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -652,49 +652,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_01_radius_(m)___________________________________________________ (rpf(01))_____________________ 6.4763E+00 + PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 - PF_coil_02_radius_(m)___________________________________________________ (rpf(02))_____________________ 6.4763E+00 + PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 - PF_coil_03_radius_(m)___________________________________________________ (rpf(03))_____________________ 1.9032E+01 + PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 - PF_coil_04_radius_(m)___________________________________________________ (rpf(04))_____________________ 1.9032E+01 + PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 - PF_coil_05_radius_(m)___________________________________________________ (rpf(05))_____________________ 1.7386E+01 + PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 - PF_coil_06_radius_(m)___________________________________________________ (rpf(06))_____________________ 1.7386E+01 + PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf(nohc))___________________ 2.6164E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 @@ -1647,49 +1647,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_01_radius_(m)___________________________________________________ (rpf(01))_____________________ 6.4763E+00 + PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 - PF_coil_02_radius_(m)___________________________________________________ (rpf(02))_____________________ 6.4763E+00 + PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 - PF_coil_03_radius_(m)___________________________________________________ (rpf(03))_____________________ 1.9032E+01 + PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 - PF_coil_04_radius_(m)___________________________________________________ (rpf(04))_____________________ 1.9032E+01 + PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 - PF_coil_05_radius_(m)___________________________________________________ (rpf(05))_____________________ 1.7386E+01 + PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 - PF_coil_06_radius_(m)___________________________________________________ (rpf(06))_____________________ 1.7386E+01 + PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf(nohc))___________________ 2.6164E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 @@ -2642,49 +2642,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_01_radius_(m)___________________________________________________ (rpf(01))_____________________ 6.4763E+00 + PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 - PF_coil_02_radius_(m)___________________________________________________ (rpf(02))_____________________ 6.4763E+00 + PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 - PF_coil_03_radius_(m)___________________________________________________ (rpf(03))_____________________ 1.9032E+01 + PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 - PF_coil_04_radius_(m)___________________________________________________ (rpf(04))_____________________ 1.9032E+01 + PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 - PF_coil_05_radius_(m)___________________________________________________ (rpf(05))_____________________ 1.7386E+01 + PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 - PF_coil_06_radius_(m)___________________________________________________ (rpf(06))_____________________ 1.7386E+01 + PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf(nohc))___________________ 2.6164E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 @@ -3637,49 +3637,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_01_radius_(m)___________________________________________________ (rpf(01))_____________________ 6.4763E+00 + PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 - PF_coil_02_radius_(m)___________________________________________________ (rpf(02))_____________________ 6.4763E+00 + PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 - PF_coil_03_radius_(m)___________________________________________________ (rpf(03))_____________________ 1.9032E+01 + PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 - PF_coil_04_radius_(m)___________________________________________________ (rpf(04))_____________________ 1.9032E+01 + PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 - PF_coil_05_radius_(m)___________________________________________________ (rpf(05))_____________________ 1.7386E+01 + PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 - PF_coil_06_radius_(m)___________________________________________________ (rpf(06))_____________________ 1.7386E+01 + PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf(nohc))___________________ 2.6164E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 @@ -4632,49 +4632,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_01_radius_(m)___________________________________________________ (rpf(01))_____________________ 6.4763E+00 + PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 - PF_coil_02_radius_(m)___________________________________________________ (rpf(02))_____________________ 6.4763E+00 + PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 - PF_coil_03_radius_(m)___________________________________________________ (rpf(03))_____________________ 1.9032E+01 + PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 - PF_coil_04_radius_(m)___________________________________________________ (rpf(04))_____________________ 1.9032E+01 + PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 - PF_coil_05_radius_(m)___________________________________________________ (rpf(05))_____________________ 1.7386E+01 + PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 - PF_coil_06_radius_(m)___________________________________________________ (rpf(06))_____________________ 1.7386E+01 + PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf(nohc))___________________ 2.6164E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 @@ -5627,49 +5627,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_01_radius_(m)___________________________________________________ (rpf(01))_____________________ 6.4763E+00 + PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 - PF_coil_02_radius_(m)___________________________________________________ (rpf(02))_____________________ 6.4763E+00 + PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 - PF_coil_03_radius_(m)___________________________________________________ (rpf(03))_____________________ 1.9032E+01 + PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 - PF_coil_04_radius_(m)___________________________________________________ (rpf(04))_____________________ 1.9032E+01 + PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 - PF_coil_05_radius_(m)___________________________________________________ (rpf(05))_____________________ 1.7386E+01 + PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 - PF_coil_06_radius_(m)___________________________________________________ (rpf(06))_____________________ 1.7386E+01 + PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf(nohc))___________________ 2.6164E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 @@ -6622,49 +6622,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_01_radius_(m)___________________________________________________ (rpf(01))_____________________ 6.4763E+00 + PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 - PF_coil_02_radius_(m)___________________________________________________ (rpf(02))_____________________ 6.4763E+00 + PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 - PF_coil_03_radius_(m)___________________________________________________ (rpf(03))_____________________ 1.9032E+01 + PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 - PF_coil_04_radius_(m)___________________________________________________ (rpf(04))_____________________ 1.9032E+01 + PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 - PF_coil_05_radius_(m)___________________________________________________ (rpf(05))_____________________ 1.7386E+01 + PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 - PF_coil_06_radius_(m)___________________________________________________ (rpf(06))_____________________ 1.7386E+01 + PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf(nohc))___________________ 2.6164E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 @@ -7617,49 +7617,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_01_radius_(m)___________________________________________________ (rpf(01))_____________________ 6.4763E+00 + PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 - PF_coil_02_radius_(m)___________________________________________________ (rpf(02))_____________________ 6.4763E+00 + PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 - PF_coil_03_radius_(m)___________________________________________________ (rpf(03))_____________________ 1.9032E+01 + PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 - PF_coil_04_radius_(m)___________________________________________________ (rpf(04))_____________________ 1.9032E+01 + PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 - PF_coil_05_radius_(m)___________________________________________________ (rpf(05))_____________________ 1.7386E+01 + PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 - PF_coil_06_radius_(m)___________________________________________________ (rpf(06))_____________________ 1.7386E+01 + PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf(nohc))___________________ 2.6164E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 @@ -8612,49 +8612,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 - PF_coil_01_radius_(m)___________________________________________________ (rpf(01))_____________________ 6.4763E+00 + PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 - PF_coil_02_radius_(m)___________________________________________________ (rpf(02))_____________________ 6.4763E+00 + PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 - PF_coil_03_radius_(m)___________________________________________________ (rpf(03))_____________________ 1.9032E+01 + PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 - PF_coil_04_radius_(m)___________________________________________________ (rpf(04))_____________________ 1.9032E+01 + PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 - PF_coil_05_radius_(m)___________________________________________________ (rpf(05))_____________________ 1.7386E+01 + PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 - PF_coil_06_radius_(m)___________________________________________________ (rpf(06))_____________________ 1.7386E+01 + PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf(nohc))___________________ 2.6164E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 37a488acef..b3e0bb1e2c 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -4256,7 +4256,7 @@ "roughness": 1e-06, "routr": 1.5, "row": 4.0, - "rpf": 0.0, + "r_pf_coil_middle": 0.0, "rpf1": 0.0, "rpf2": -1.63, "dr_pf_cryostat": 0.5, @@ -10563,7 +10563,7 @@ "roughness": "first wall channel roughness epsilon (m)", "routr": "radial distance (m) from outboard TF coil leg to centre of `i_pf_location=3` PF coils", "row": "clearance to building wall for crane operation (m)", - "rpf": "radius of PF coil i (m)", + "r_pf_coil_middle": "radius of PF coil i (m)", "rpf1": "offset (m) of radial position of `i_pf_location=1` PF coils from being directly above\n the central solenoid", "rpf2": "offset (m) of radial position of `i_pf_location=2` PF coils from being at\n rmajor (offset = rpf2triangrminor)", "dr_pf_cryostat": "Radial distance between furthest PF coil (or stellarator\n modular coil) and cryostat (m)", @@ -18982,7 +18982,7 @@ "rjpfalw", "r_cs_middle", "routr", - "rpf", + "r_pf_coil_middle", "rpf1", "rpf2", "rref", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 64ee491b68..c823c21dba 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -87,7 +87,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "vf", np.full(22, 3.0e-1)) monkeypatch.setattr(pfv, "turns", np.full(22, 0.0)) monkeypatch.setattr(pfv, "curpfs", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "rpf", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "r_pf_coil_middle", np.full(22, 0.0)) monkeypatch.setattr(pfv, "zref", [3.6, 1.2, 2.5, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0]) monkeypatch.setattr(pfv, "pfmmax", 0.0) monkeypatch.setattr(pfv, "i_pf_conductor", 0) @@ -223,7 +223,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "jscoh_bop", 3.562e8) monkeypatch.setattr(pfv, "cptdin", np.full(22, 4.22e4)) monkeypatch.setattr(pfv, "pfcaseth", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "rpf", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "r_pf_coil_middle", np.full(22, 0.0)) monkeypatch.setattr(pfv, "cohbop", 1.693e7) monkeypatch.setattr(pfv, "zh", np.full(22, 0.0)) monkeypatch.setattr(pfv, "wtc", np.full(22, 0.0)) @@ -2303,7 +2303,7 @@ def test_peakb(monkeypatch: pytest.MonkeyPatch, pfcoil: PFCoil): ) monkeypatch.setattr( pfv, - "rpf", + "r_pf_coil_middle", np.array([ 6.2732560483870969, 6.2732560483870969, @@ -2835,7 +2835,7 @@ def test_induct(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): ) monkeypatch.setattr( pfv, - "rpf", + "r_pf_coil_middle", np.array([ 6.2732560483870969, 6.2732560483870969, diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 868433e5c4..cf2be609e4 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -819,49 +819,49 @@ Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 1.0000E+00 - PF_coil_0_radius_(m)____________________________________________________ (rpf[0]_______________________ 5.5667E+00 + PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3738E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2662E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2662E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4091E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7637E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.1628E+00 - PF_coil_1_radius_(m)____________________________________________________ (rpf[1]_______________________ 5.5667E+00 + PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0608E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3575E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3575E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.0673E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0269E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6276E+00 - PF_coil_2_radius_(m)____________________________________________________ (rpf[2]_______________________ 1.6738E+01 + PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6738E+01 PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1326E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1326E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9242E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6968E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6370E+00 - PF_coil_3_radius_(m)____________________________________________________ (rpf[3]_______________________ 1.6738E+01 + PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6738E+01 PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1326E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1326E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9242E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6968E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6370E+00 - PF_coil_4_radius_(m)____________________________________________________ (rpf[4]_______________________ 1.5216E+01 + PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5216E+01 PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0591E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0591E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.2990E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.1960E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5683E+00 - PF_coil_5_radius_(m)____________________________________________________ (rpf[5]_______________________ 1.5216E+01 + PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5216E+01 PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0591E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0591E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.2990E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.1960E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5683E+00 - Central_solenoid_radius_(m)_____________________________________________ (rpf[nohc-1])_________________ 2.2588E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2588E+00 Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7696E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 68f40111d3..39a5bc7ae2 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -2040,7 +2040,7 @@ class Acc2222Param(NamedTuple): ric: Any = None - rpf: Any = None + r_pf_coil_middle: Any = None i_cs_superconductor: Any = None @@ -2194,7 +2194,7 @@ class Acc2222Param(NamedTuple): ), order="F", ).transpose(), - rpf=np.array( + r_pf_coil_middle=np.array( np.array( ( 6.2732560483870969, @@ -2390,7 +2390,7 @@ class Acc2222Param(NamedTuple): ), order="F", ).transpose(), - rpf=np.array( + r_pf_coil_middle=np.array( np.array( ( 6.2732560483870969, @@ -2586,7 +2586,7 @@ class Acc2222Param(NamedTuple): ), order="F", ).transpose(), - rpf=np.array( + r_pf_coil_middle=np.array( np.array( ( 6.2732560483870969, @@ -2731,7 +2731,9 @@ def test_acc2222(acc2222param, monkeypatch, costs): monkeypatch.setattr(pfcoil_variables, "ric", acc2222param.ric) - monkeypatch.setattr(pfcoil_variables, "rpf", acc2222param.rpf) + monkeypatch.setattr( + pfcoil_variables, "r_pf_coil_middle", acc2222param.r_pf_coil_middle + ) monkeypatch.setattr( pfcoil_variables, "i_cs_superconductor", acc2222param.i_cs_superconductor diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 13a16bae26..41a056172b 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -219,7 +219,7 @@ class PfpwrParam(NamedTuple): rjconpf: Any = None - rpf: Any = None + r_pf_coil_middle: Any = None p_plasma_ohmic_mw: Any = None @@ -828,7 +828,7 @@ class PfpwrParam(NamedTuple): ), order="F", ).transpose(), - rpf=np.array( + r_pf_coil_middle=np.array( np.array( ( 6.2732560483870969, @@ -1571,7 +1571,7 @@ class PfpwrParam(NamedTuple): ), order="F", ).transpose(), - rpf=np.array( + r_pf_coil_middle=np.array( np.array( ( 6.2732560483870969, @@ -1824,7 +1824,9 @@ def test_pfpwr(pfpwrparam, monkeypatch, power): monkeypatch.setattr(pfcoil_variables, "rjconpf", pfpwrparam.rjconpf) - monkeypatch.setattr(pfcoil_variables, "rpf", pfpwrparam.rpf) + monkeypatch.setattr( + pfcoil_variables, "r_pf_coil_middle", pfpwrparam.r_pf_coil_middle + ) monkeypatch.setattr( physics_variables, "p_plasma_ohmic_mw", pfpwrparam.p_plasma_ohmic_mw From 90d9bbc8edb5c95ee2ec9efafefc8fa0c4ad3c65 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 13:39:14 +0000 Subject: [PATCH 10/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'rb'=20to=20'r=5F?= =?UTF-8?q?pf=5Fcoil=5Fouter'=20across=20multiple=20files=20for=20consiste?= =?UTF-8?q?ncy=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 2 +- process/pfcoil.py | 46 ++++++++++++++++------------ source/fortran/pfcoil_variables.f90 | 4 +-- tests/integration/ref_dicts.json | 6 ++-- tests/integration/test_pfcoil_int.py | 10 +++--- tests/unit/test_blanket_library.py | 8 +++-- tests/unit/test_pfcoil.py | 2 +- 7 files changed, 43 insertions(+), 35 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 9a208be93e..109dfbde3a 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -378,7 +378,7 @@ def external_cryo_geometry() -> None: # Cryostat radius [m] # Take radius of furthest PF coil and add clearance fwbs_variables.r_cryostat_inboard = ( - np.max(pfcoil_variables.rb) + fwbs_variables.dr_pf_cryostat + np.max(pfcoil_variables.r_pf_coil_outer) + fwbs_variables.dr_pf_cryostat ) # Clearance between uppermost PF coil and cryostat lid [m]. diff --git a/process/pfcoil.py b/process/pfcoil.py index a0439d9246..3fbc87e6b7 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -547,11 +547,11 @@ def pfcoil(self): pfv.rjconpf[i] = 1.0e6 * abs(pfv.ric[i]) / area # Location of edges of each coil: - # r_pf_coil_inner = inner radius, rb = outer radius + # r_pf_coil_inner = inner radius, r_pf_coil_outer = outer radius # zl = 'lower' edge z (i.e. edge nearer to midplane) # zh = 'upper' edge z (i.e. edge further from midplane) pfv.r_pf_coil_inner[i] = pfv.r_pf_coil_middle[i] - dx - pfv.rb[i] = pfv.r_pf_coil_middle[i] + dx + pfv.r_pf_coil_outer[i] = pfv.r_pf_coil_middle[i] + dx pfv.zl[i] = pfv.zpf[i] - dz if pfv.zpf[i] < 0.0e0: @@ -576,7 +576,7 @@ def pfcoil(self): dx = 0.5e0 * math.sqrt(area) # square cross-section pfv.r_pf_coil_inner[i] = pfv.r_pf_coil_middle[i] - dx - pfv.rb[i] = pfv.r_pf_coil_middle[i] + dx + pfv.r_pf_coil_outer[i] = pfv.r_pf_coil_middle[i] + dx pfv.zl[i] = pfv.zpf[i] - dx if pfv.zpf[i] < 0.0e0: @@ -587,7 +587,7 @@ def pfcoil(self): pfv.zh[i] = pfv.zpf[i] - dx # Outside radius of largest PF coil (m) - pfv.pfrmax = max(pfv.pfrmax, pfv.rb[i]) + pfv.pfrmax = max(pfv.pfrmax, pfv.r_pf_coil_outer[i]) i = i + 1 @@ -693,7 +693,9 @@ def pfcoil(self): # Thickness found via a simple quadratic equation drpdz = ( - pfv.rb[i] - pfv.r_pf_coil_inner[i] + abs(pfv.zh[i] - pfv.zl[i]) + pfv.r_pf_coil_outer[i] + - pfv.r_pf_coil_inner[i] + + abs(pfv.zh[i] - pfv.zl[i]) ) # dr + dz pfv.pfcaseth[i] = 0.25e0 * ( -drpdz + math.sqrt(drpdz * drpdz + 4.0e0 * areaspf) @@ -755,7 +757,7 @@ def pfcoil(self): pfv.zh[pfv.nohc] = pv.rminor * pv.kappa pfv.zl[pfv.nohc] = -pv.rminor * pv.kappa pfv.r_pf_coil_inner[pfv.nohc] = pv.rmajor - pv.rminor - pfv.rb[pfv.nohc] = pv.rmajor + pv.rminor + pfv.r_pf_coil_outer[pfv.nohc] = pv.rmajor + pv.rminor pfv.turns[pfv.nohc] = 1.0e0 # Generate coil currents as a function of time using @@ -1005,10 +1007,10 @@ def ohcalc(self): pfv.zpf[pfv.nohc - 1] = 0.0e0 # Radius of outer edge - pfv.rb[pfv.nohc - 1] = pfv.r_cs_middle + 0.5e0 * bv.dr_cs + pfv.r_pf_coil_outer[pfv.nohc - 1] = pfv.r_cs_middle + 0.5e0 * bv.dr_cs # Radius of inner edge - pfv.r_pf_coil_inner[pfv.nohc - 1] = pfv.rb[pfv.nohc - 1] - bv.dr_cs + pfv.r_pf_coil_inner[pfv.nohc - 1] = pfv.r_pf_coil_outer[pfv.nohc - 1] - bv.dr_cs # Total cross-sectional area pfv.areaoh = 2.0e0 * hohc * bv.dr_cs @@ -1065,7 +1067,7 @@ def ohcalc(self): bmaxoh2 = self.bfmax( pfv.coheof, pfv.r_pf_coil_inner[pfv.nohc - 1], - pfv.rb[pfv.nohc - 1], + pfv.r_pf_coil_outer[pfv.nohc - 1], hohc, ) @@ -1084,7 +1086,7 @@ def ohcalc(self): pfv.bmaxoh0 = self.bfmax( pfv.cohbop, pfv.r_pf_coil_inner[pfv.nohc - 1], - pfv.rb[pfv.nohc - 1], + pfv.r_pf_coil_outer[pfv.nohc - 1], hohc, ) timepoint = 2 @@ -1364,7 +1366,7 @@ def peakb(self, i, ii, it): pf.rfxf[:kk], pf.zfxf[:kk], pf.cfxf[:kk], - pfv.rb[i - 1], + pfv.r_pf_coil_outer[i - 1], pfv.zpf[i - 1], ) @@ -1513,7 +1515,7 @@ def hoop_stress(self, r): a = pfv.r_pf_coil_inner[pfv.nohc - 1] # Outer radius of central Solenoid [m] - b = pfv.rb[pfv.nohc - 1] + b = pfv.r_pf_coil_outer[pfv.nohc - 1] # alpha alpha = b / a @@ -1576,7 +1578,7 @@ def axial_stress(self): :return: unsmeared axial stress [MPa], axial force [N] :rtype: tuple[float, float] """ - b = pfv.rb[pfv.nohc - 1] + b = pfv.r_pf_coil_outer[pfv.nohc - 1] # Half height of central Solenoid [m] hl = pfv.zh[pfv.nohc - 1] @@ -1614,7 +1616,8 @@ def axial_stress(self): # axial area [m2] area_ax = constants.pi * ( - pfv.rb[pfv.nohc - 1] ** 2 - pfv.r_pf_coil_inner[pfv.nohc - 1] ** 2 + pfv.r_pf_coil_outer[pfv.nohc - 1] ** 2 + - pfv.r_pf_coil_inner[pfv.nohc - 1] ** 2 ) # calculate unsmeared axial stress [MPa] @@ -1659,7 +1662,10 @@ def induct(self, output): math.ceil( 2.0e0 * pfv.zh[pfv.nohc - 1] - / (pfv.rb[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]) + / ( + pfv.r_pf_coil_outer[pfv.nohc - 1] + - pfv.r_pf_coil_inner[pfv.nohc - 1] + ) ) ) @@ -1766,7 +1772,7 @@ def induct(self, output): a = pfv.r_cs_middle # mean radius of coil b = 2.0e0 * pfv.zh[pfv.nohc - 1] # length of coil c = ( - pfv.rb[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1] + pfv.r_pf_coil_outer[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1] ) # radial winding thickness pfv.sxlg[pfv.nohc - 1, pfv.nohc - 1] = self.selfinductance( a, b, c, pfv.turns[pfv.nohc - 1] @@ -2346,7 +2352,7 @@ def outpf(self): for k in range(pf.nef): op.write( self.outfile, - f"PF {k}\t\t\t{pfv.r_pf_coil_middle[k]:.2e}\t{pfv.zpf[k]:.2e}\t{pfv.rb[k] - pfv.r_pf_coil_inner[k]:.2e}\t{abs(pfv.zh[k] - pfv.zl[k]):.2e}\t{pfv.turns[k]:.2e}", + f"PF {k}\t\t\t{pfv.r_pf_coil_middle[k]:.2e}\t{pfv.zpf[k]:.2e}\t{pfv.r_pf_coil_outer[k] - pfv.r_pf_coil_inner[k]:.2e}\t{abs(pfv.zh[k] - pfv.zl[k]):.2e}\t{pfv.turns[k]:.2e}", ) for k in range(pf.nef): @@ -2366,7 +2372,7 @@ def outpf(self): self.mfile, f"PF coil {k} radial thickness (m)", f"(pfdr({k}))", - pfv.rb[k] - pfv.r_pf_coil_inner[k], + pfv.r_pf_coil_outer[k] - pfv.r_pf_coil_inner[k], ) op.ovarre( self.mfile, @@ -2398,7 +2404,7 @@ def outpf(self): if bv.iohcl != 0: op.write( self.outfile, - f"CS\t\t\t\t{pfv.r_pf_coil_middle[pfv.nohc - 1]:.2e}\t{pfv.zpf[pfv.nohc - 1]:.2e}\t{pfv.rb[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]:.2e}\t{abs(pfv.zh[pfv.nohc - 1] - pfv.zl[pfv.nohc - 1]):.2e}\t{pfv.turns[pfv.nohc - 1]:.2e}\t{pfv.pfcaseth[pfv.nohc - 1]:.2e}", + f"CS\t\t\t\t{pfv.r_pf_coil_middle[pfv.nohc - 1]:.2e}\t{pfv.zpf[pfv.nohc - 1]:.2e}\t{pfv.r_pf_coil_outer[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]:.2e}\t{abs(pfv.zh[pfv.nohc - 1] - pfv.zl[pfv.nohc - 1]):.2e}\t{pfv.turns[pfv.nohc - 1]:.2e}\t{pfv.pfcaseth[pfv.nohc - 1]:.2e}", ) op.ovarre( self.mfile, @@ -2416,7 +2422,7 @@ def outpf(self): self.mfile, "Central solenoid radial thickness (m)", "(ohdr)", - (pfv.rb[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]), + (pfv.r_pf_coil_outer[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]), ) op.ovarre( self.mfile, diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 80dabf0e5c..342059eb3d 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -252,7 +252,7 @@ module pfcoil_variables real(dp), dimension(ngc2) :: r_pf_coil_inner !! inner radius of coil i (m) - real(dp), dimension(ngc2) :: rb + real(dp), dimension(ngc2) :: r_pf_coil_outer !! outer radius of coil i (m) real(dp), dimension(ngc2) :: ric @@ -473,7 +473,7 @@ subroutine init_pfcoil_variables powohres = 0.0D0 powpfres = 0.0D0 r_pf_coil_inner = 0.0D0 - rb = 0.0D0 + r_pf_coil_outer = 0.0D0 ric = 0.0D0 rjconpf = (/3.0D7, 3.0D7, 3.0D7, & 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, & diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index b3e0bb1e2c..6415097c16 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3759,7 +3759,7 @@ "radp": null, "f_nd_alpha_electron": 0.1, "rat": 1.3e-08, - "rb": 0.0, + "r_pf_coil_outer": 0.0, "rbld": 0.0, "rbmax": 0.0, "rbrt": 1.0, @@ -10483,7 +10483,7 @@ "radial_array": "Array refining the radii of the stress calculations arrays", "f_nd_alpha_electron": "thermal alpha density/electron density (`iteration variable 109`) (calculated if `ipedestal=3`)", "rat": "plasma chamber wall outgassing rate (Pa-m/s)", - "rb": "outer radius of coil i (m)", + "r_pf_coil_outer": "outer radius of coil i (m)", "rbld": "sum of thicknesses to the major radius (m)", "rbmax": "Radius of maximum TF B-field (m)", "rbrt": "reactor building roof thickness (m)", @@ -18974,7 +18974,7 @@ "powohres", "powpfres", "r_pf_coil_inner", - "rb", + "r_pf_coil_outer", "ric", "rjconpf", "rjohc", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index c823c21dba..20e742a1e5 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -102,7 +102,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "zh", np.full(22, 0.0)) monkeypatch.setattr(pfv, "fcohbof", 2.654e-1) monkeypatch.setattr(pfv, "r_pf_coil_inner", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "rb", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "r_pf_coil_outer", np.full(22, 0.0)) monkeypatch.setattr(pfv, "i_pf_superconductor", 3) monkeypatch.setattr(pfv, "i_cs_superconductor", 1) monkeypatch.setattr(pfv, "whtpf", 0.0) @@ -218,7 +218,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "bpf", np.full(22, 0.0)) monkeypatch.setattr(pfv, "jscoh_eof", 4.758e8) monkeypatch.setattr(pfv, "zpf", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "rb", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "r_pf_coil_outer", np.full(22, 0.0)) monkeypatch.setattr(pfv, "r_pf_coil_inner", np.full(22, 0.0)) monkeypatch.setattr(pfv, "jscoh_bop", 3.562e8) monkeypatch.setattr(pfv, "cptdin", np.full(22, 4.22e4)) @@ -2275,7 +2275,7 @@ def test_peakb(monkeypatch: pytest.MonkeyPatch, pfcoil: PFCoil): monkeypatch.setattr(pfv, "ohhghf", 0.90000000000000002) monkeypatch.setattr( pfv, - "rb", + "r_pf_coil_outer", np.array([ 6.8520884119768697, 6.9480065348448967, @@ -2615,7 +2615,7 @@ def test_axial_stress(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): monkeypatch.setattr(pfv, "nohc", 7) monkeypatch.setattr( pfv, - "rb", + "r_pf_coil_outer", np.array([ 6.8520884119768697, 6.9480065348448967, @@ -2952,7 +2952,7 @@ def test_induct(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): ) monkeypatch.setattr( pfv, - "rb", + "r_pf_coil_outer", np.array([ 6.8520884119768697, 6.9480065348448967, diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index ac72d3ac45..340ec8578f 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -1235,7 +1235,7 @@ class ExternalCryoGeometryParam(NamedTuple): vdewin: Any = None denstl: Any = None dewmkg: Any = None - rb: Any = None + r_pf_coil_outer: Any = None zh: Any = None dz_tf_cryostat: Any = None dz_pf_cryostat: Any = None @@ -1264,7 +1264,7 @@ class ExternalCryoGeometryParam(NamedTuple): vdewin=1016.2876250857248, denstl=7800, dewmkg=0, - rb=np.array( + r_pf_coil_outer=np.array( np.array( ( 6.1290994712971543, @@ -1380,7 +1380,9 @@ def test_external_cryo_geometry( monkeypatch.setattr(fwbs_variables, "vdewin", externalcryogeometryparam.vdewin) monkeypatch.setattr(fwbs_variables, "denstl", externalcryogeometryparam.denstl) monkeypatch.setattr(fwbs_variables, "dewmkg", externalcryogeometryparam.dewmkg) - monkeypatch.setattr(pfcoil_variables, "rb", externalcryogeometryparam.rb) + monkeypatch.setattr( + pfcoil_variables, "r_pf_coil_outer", externalcryogeometryparam.r_pf_coil_outer + ) monkeypatch.setattr(pfcoil_variables, "zh", externalcryogeometryparam.zh) monkeypatch.setattr( buildings_variables, "dz_tf_cryostat", externalcryogeometryparam.dz_tf_cryostat diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index 8382e438cc..a908e90f15 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1982,7 +1982,7 @@ def test_hoop_stress(pfcoil, monkeypatch): monkeypatch.setattr(pfv, "nohc", 7) monkeypatch.setattr( pfv, - "rb", + "r_pf_coil_outer", np.array([ 6.8520884119768697, 6.9480065348448967, From b5f3e80e6dce043b5a77fb6dccab0deae3da25ee Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 13:54:32 +0000 Subject: [PATCH 11/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'zh'=20to=20'z=5F?= =?UTF-8?q?pf=5Fcoil=5Fupper'=20across=20multiple=20files=20for=20consiste?= =?UTF-8?q?ncy=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 2 +- process/pfcoil.py | 44 +++++++++++++++------------- source/fortran/pfcoil_variables.f90 | 4 +-- tests/integration/ref_dicts.json | 6 ++-- tests/integration/test_pfcoil_int.py | 10 +++---- tests/unit/test_blanket_library.py | 8 +++-- 6 files changed, 39 insertions(+), 35 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 109dfbde3a..d9479e2606 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -392,7 +392,7 @@ def external_cryo_geometry() -> None: # Half-height of cryostat [m] # Take height of furthest PF coil and add clearance fwbs_variables.z_cryostat_half_inside = ( - np.max(pfcoil_variables.zh) + blanket_library.dz_pf_cryostat + np.max(pfcoil_variables.z_pf_coil_upper) + blanket_library.dz_pf_cryostat ) # Vertical clearance between TF coil and cryostat (m) diff --git a/process/pfcoil.py b/process/pfcoil.py index 3fbc87e6b7..d21d429b3c 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -549,7 +549,7 @@ def pfcoil(self): # Location of edges of each coil: # r_pf_coil_inner = inner radius, r_pf_coil_outer = outer radius # zl = 'lower' edge z (i.e. edge nearer to midplane) - # zh = 'upper' edge z (i.e. edge further from midplane) + # z_pf_coil_upper = 'upper' edge z (i.e. edge further from midplane) pfv.r_pf_coil_inner[i] = pfv.r_pf_coil_middle[i] - dx pfv.r_pf_coil_outer[i] = pfv.r_pf_coil_middle[i] + dx @@ -557,10 +557,10 @@ def pfcoil(self): if pfv.zpf[i] < 0.0e0: pfv.zl[i] = pfv.zpf[i] + dz - pfv.zh[i] = pfv.zpf[i] + dz + pfv.z_pf_coil_upper[i] = pfv.zpf[i] + dz if pfv.zpf[i] < 0.0e0: - pfv.zh[i] = pfv.zpf[i] - dz + pfv.z_pf_coil_upper[i] = pfv.zpf[i] - dz else: # Other coils. N.B. Current density RJCONPF[i] is defined in @@ -582,9 +582,9 @@ def pfcoil(self): if pfv.zpf[i] < 0.0e0: pfv.zl[i] = pfv.zpf[i] + dx - pfv.zh[i] = pfv.zpf[i] + dx + pfv.z_pf_coil_upper[i] = pfv.zpf[i] + dx if pfv.zpf[i] < 0.0e0: - pfv.zh[i] = pfv.zpf[i] - dx + pfv.z_pf_coil_upper[i] = pfv.zpf[i] - dx # Outside radius of largest PF coil (m) pfv.pfrmax = max(pfv.pfrmax, pfv.r_pf_coil_outer[i]) @@ -695,7 +695,7 @@ def pfcoil(self): drpdz = ( pfv.r_pf_coil_outer[i] - pfv.r_pf_coil_inner[i] - + abs(pfv.zh[i] - pfv.zl[i]) + + abs(pfv.z_pf_coil_upper[i] - pfv.zl[i]) ) # dr + dz pfv.pfcaseth[i] = 0.25e0 * ( -drpdz + math.sqrt(drpdz * drpdz + 4.0e0 * areaspf) @@ -754,7 +754,7 @@ def pfcoil(self): pf.ricpf = pf.ricpf + abs(pfv.ric[i]) # Plasma size and shape - pfv.zh[pfv.nohc] = pv.rminor * pv.kappa + pfv.z_pf_coil_upper[pfv.nohc] = pv.rminor * pv.kappa pfv.zl[pfv.nohc] = -pv.rminor * pv.kappa pfv.r_pf_coil_inner[pfv.nohc] = pv.rmajor - pv.rminor pfv.r_pf_coil_outer[pfv.nohc] = pv.rmajor + pv.rminor @@ -999,8 +999,8 @@ def ohcalc(self): hohc = bv.hmax * pfv.ohhghf # Z coordinates of coil edges - pfv.zh[pfv.nohc - 1] = hohc - pfv.zl[pfv.nohc - 1] = -pfv.zh[pfv.nohc - 1] + pfv.z_pf_coil_upper[pfv.nohc - 1] = hohc + pfv.zl[pfv.nohc - 1] = -pfv.z_pf_coil_upper[pfv.nohc - 1] # (R,Z) coordinates of coil centre pfv.r_pf_coil_middle[pfv.nohc - 1] = pfv.r_cs_middle @@ -1312,7 +1312,7 @@ def peakb(self, i, ii, it): # Self field from coil (Lyle's Method) kk = kk + 1 - dzpf = pfv.zh[jj - 1] - pfv.zl[jj - 1] + dzpf = pfv.z_pf_coil_upper[jj - 1] - pfv.zl[jj - 1] pf.rfxf[kk - 1] = pfv.r_pf_coil_middle[jj - 1] pf.zfxf[kk - 1] = pfv.zpf[jj - 1] + dzpf * 0.125e0 pf.cfxf[kk - 1] = ( @@ -1581,7 +1581,7 @@ def axial_stress(self): b = pfv.r_pf_coil_outer[pfv.nohc - 1] # Half height of central Solenoid [m] - hl = pfv.zh[pfv.nohc - 1] + hl = pfv.z_pf_coil_upper[pfv.nohc - 1] # Central Solenoid current [A] ni = pfv.ric[pfv.nohc - 1] * 1.0e6 @@ -1661,7 +1661,7 @@ def induct(self, output): noh = int( math.ceil( 2.0e0 - * pfv.zh[pfv.nohc - 1] + * pfv.z_pf_coil_upper[pfv.nohc - 1] / ( pfv.r_pf_coil_outer[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1] @@ -1689,10 +1689,10 @@ def induct(self, output): roh[:] = pfv.r_cs_middle delzoh = ( - 2.0e0 * pfv.zh[pfv.nohc - 1] / noh - ) # zh(nohc) is the half-height of the coil + 2.0e0 * pfv.z_pf_coil_upper[pfv.nohc - 1] / noh + ) # z_pf_coil_upper(nohc) is the half-height of the coil for i in range(noh): - zoh[i] = pfv.zh[pfv.nohc - 1] - delzoh * (0.5e0 + i) + zoh[i] = pfv.z_pf_coil_upper[pfv.nohc - 1] - delzoh * (0.5e0 + i) rplasma[0] = pv.rmajor # assumes nplas==1 zplasma[0] = 0.0 @@ -1770,7 +1770,7 @@ def induct(self, output): if bv.iohcl != 0: # Central Solenoid self inductance a = pfv.r_cs_middle # mean radius of coil - b = 2.0e0 * pfv.zh[pfv.nohc - 1] # length of coil + b = 2.0e0 * pfv.z_pf_coil_upper[pfv.nohc - 1] # length of coil c = ( pfv.r_pf_coil_outer[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1] ) # radial winding thickness @@ -1822,7 +1822,9 @@ def induct(self, output): if k < i: pfv.sxlg[i, k] = xc[k] * pfv.turns[k] * pfv.turns[i] elif k == i: - rl = abs(pfv.zh[k] - pfv.zl[k]) / math.sqrt(constants.pi) + rl = abs(pfv.z_pf_coil_upper[k] - pfv.zl[k]) / math.sqrt( + constants.pi + ) pfv.sxlg[k, k] = ( constants.rmu0 * pfv.turns[k] ** 2 @@ -2352,7 +2354,7 @@ def outpf(self): for k in range(pf.nef): op.write( self.outfile, - f"PF {k}\t\t\t{pfv.r_pf_coil_middle[k]:.2e}\t{pfv.zpf[k]:.2e}\t{pfv.r_pf_coil_outer[k] - pfv.r_pf_coil_inner[k]:.2e}\t{abs(pfv.zh[k] - pfv.zl[k]):.2e}\t{pfv.turns[k]:.2e}", + f"PF {k}\t\t\t{pfv.r_pf_coil_middle[k]:.2e}\t{pfv.zpf[k]:.2e}\t{pfv.r_pf_coil_outer[k] - pfv.r_pf_coil_inner[k]:.2e}\t{abs(pfv.z_pf_coil_upper[k] - pfv.zl[k]):.2e}\t{pfv.turns[k]:.2e}", ) for k in range(pf.nef): @@ -2378,7 +2380,7 @@ def outpf(self): self.mfile, f"PF coil {k} vertical thickness (m)", f"(pfdz({k}))", - pfv.zh[k] - pfv.zl[k], + pfv.z_pf_coil_upper[k] - pfv.zl[k], ) op.ovarre( self.mfile, @@ -2404,7 +2406,7 @@ def outpf(self): if bv.iohcl != 0: op.write( self.outfile, - f"CS\t\t\t\t{pfv.r_pf_coil_middle[pfv.nohc - 1]:.2e}\t{pfv.zpf[pfv.nohc - 1]:.2e}\t{pfv.r_pf_coil_outer[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]:.2e}\t{abs(pfv.zh[pfv.nohc - 1] - pfv.zl[pfv.nohc - 1]):.2e}\t{pfv.turns[pfv.nohc - 1]:.2e}\t{pfv.pfcaseth[pfv.nohc - 1]:.2e}", + f"CS\t\t\t\t{pfv.r_pf_coil_middle[pfv.nohc - 1]:.2e}\t{pfv.zpf[pfv.nohc - 1]:.2e}\t{pfv.r_pf_coil_outer[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]:.2e}\t{abs(pfv.z_pf_coil_upper[pfv.nohc - 1] - pfv.zl[pfv.nohc - 1]):.2e}\t{pfv.turns[pfv.nohc - 1]:.2e}\t{pfv.pfcaseth[pfv.nohc - 1]:.2e}", ) op.ovarre( self.mfile, @@ -2428,7 +2430,7 @@ def outpf(self): self.mfile, "Central solenoid vertical thickness (m)", "(ohdz)", - (pfv.zh[pfv.nohc - 1] - pfv.zl[pfv.nohc - 1]), + (pfv.z_pf_coil_upper[pfv.nohc - 1] - pfv.zl[pfv.nohc - 1]), ) op.ovarre( self.mfile, diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 342059eb3d..a1929ea4c6 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -365,7 +365,7 @@ module pfcoil_variables real(dp), dimension(ngc2) :: wts !! structure mass for PF coil i (kg) - real(dp), dimension(ngc2) :: zh + real(dp), dimension(ngc2) :: z_pf_coil_upper !! upper point of PF coil i (m) real(dp), dimension(ngc2) :: zl @@ -511,7 +511,7 @@ subroutine init_pfcoil_variables whtpfs = 0.0D0 wtc = 0.0D0 wts = 0.0D0 - zh = 0.0D0 + z_pf_coil_upper = 0.0D0 zl = 0.0D0 zpf = 0.0D0 zref = (/3.6D0, 1.2D0, 2.5D0, & diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 6415097c16..845f492391 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8651,7 +8651,7 @@ 0.0, 0.0 ], - "zh": 0.0, + "z_pf_coil_upper": 0.0, "zl": 0.0, "zl1": 0.0, "zl2": 0.0, @@ -11232,7 +11232,7 @@ "zeffmax": "maximum value for Zeff (`constraint equation 64`)", "zero": "", "zfxf": "", - "zh": "upper point of PF coil i (m)", + "z_pf_coil_upper": "upper point of PF coil i (m)", "zl": "lower point of PF coil i (m)", "zl1": "IFE vertical build below centre (m)", "zl2": "IFE vertical build below centre (m)", @@ -19008,7 +19008,7 @@ "whtpfs", "wtc", "wts", - "zh", + "z_pf_coil_upper", "zl", "zpf", "zref", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 20e742a1e5..c44341c74a 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -99,7 +99,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "sxlg", np.full([22, 22], 0.0)) monkeypatch.setattr(pfv, "sigpfcalw", 5.0e2) monkeypatch.setattr(pfv, "coheof", 1.6932e7) - monkeypatch.setattr(pfv, "zh", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "z_pf_coil_upper", np.full(22, 0.0)) monkeypatch.setattr(pfv, "fcohbof", 2.654e-1) monkeypatch.setattr(pfv, "r_pf_coil_inner", np.full(22, 0.0)) monkeypatch.setattr(pfv, "r_pf_coil_outer", np.full(22, 0.0)) @@ -225,7 +225,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "pfcaseth", np.full(22, 0.0)) monkeypatch.setattr(pfv, "r_pf_coil_middle", np.full(22, 0.0)) monkeypatch.setattr(pfv, "cohbop", 1.693e7) - monkeypatch.setattr(pfv, "zh", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "z_pf_coil_upper", np.full(22, 0.0)) monkeypatch.setattr(pfv, "wtc", np.full(22, 0.0)) monkeypatch.setattr(pfv, "zl", np.full(22, 0.0)) monkeypatch.setattr(pfv, "turns", np.full(22, 0.0)) @@ -2507,7 +2507,7 @@ def test_peakb(monkeypatch: pytest.MonkeyPatch, pfcoil: PFCoil): monkeypatch.setattr(pfv, "cohbop", 19311657.760000002) monkeypatch.setattr( pfv, - "zh", + "z_pf_coil_upper", np.array([ 10.184979073267192, -11.815840508019832, @@ -2699,7 +2699,7 @@ def test_axial_stress(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): ) monkeypatch.setattr( pfv, - "zh", + "z_pf_coil_upper", np.array([ 10.184979073267192, -11.815840508019832, @@ -2924,7 +2924,7 @@ def test_induct(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): ) monkeypatch.setattr( pfv, - "zh", + "z_pf_coil_upper", np.array([ 10.184979073267192, -11.815840508019832, diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 340ec8578f..e2d5afa66e 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -1236,7 +1236,7 @@ class ExternalCryoGeometryParam(NamedTuple): denstl: Any = None dewmkg: Any = None r_pf_coil_outer: Any = None - zh: Any = None + z_pf_coil_upper: Any = None dz_tf_cryostat: Any = None dz_pf_cryostat: Any = None expected_r_cryostat_inboard: Any = None @@ -1294,7 +1294,7 @@ class ExternalCryoGeometryParam(NamedTuple): ), order="F", ).transpose(), - zh=np.array( + z_pf_coil_upper=np.array( np.array( ( 9.9154920004377978, @@ -1383,7 +1383,9 @@ def test_external_cryo_geometry( monkeypatch.setattr( pfcoil_variables, "r_pf_coil_outer", externalcryogeometryparam.r_pf_coil_outer ) - monkeypatch.setattr(pfcoil_variables, "zh", externalcryogeometryparam.zh) + monkeypatch.setattr( + pfcoil_variables, "z_pf_coil_upper", externalcryogeometryparam.z_pf_coil_upper + ) monkeypatch.setattr( buildings_variables, "dz_tf_cryostat", externalcryogeometryparam.dz_tf_cryostat ) From 8a75d9a278809da3af7b1ebeea049b47f8233f48 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 13:57:48 +0000 Subject: [PATCH 12/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'zl'=20to=20'z=5F?= =?UTF-8?q?pf=5Fcoil=5Flower'=20across=20multiple=20files=20for=20consiste?= =?UTF-8?q?ncy=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 32 ++++++++++++++-------------- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/integration/test_pfcoil_int.py | 8 +++---- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index d21d429b3c..863134fe5e 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -548,14 +548,14 @@ def pfcoil(self): # Location of edges of each coil: # r_pf_coil_inner = inner radius, r_pf_coil_outer = outer radius - # zl = 'lower' edge z (i.e. edge nearer to midplane) + # z_pf_coil_lower = 'lower' edge z (i.e. edge nearer to midplane) # z_pf_coil_upper = 'upper' edge z (i.e. edge further from midplane) pfv.r_pf_coil_inner[i] = pfv.r_pf_coil_middle[i] - dx pfv.r_pf_coil_outer[i] = pfv.r_pf_coil_middle[i] + dx - pfv.zl[i] = pfv.zpf[i] - dz + pfv.z_pf_coil_lower[i] = pfv.zpf[i] - dz if pfv.zpf[i] < 0.0e0: - pfv.zl[i] = pfv.zpf[i] + dz + pfv.z_pf_coil_lower[i] = pfv.zpf[i] + dz pfv.z_pf_coil_upper[i] = pfv.zpf[i] + dz @@ -578,9 +578,9 @@ def pfcoil(self): pfv.r_pf_coil_inner[i] = pfv.r_pf_coil_middle[i] - dx pfv.r_pf_coil_outer[i] = pfv.r_pf_coil_middle[i] + dx - pfv.zl[i] = pfv.zpf[i] - dx + pfv.z_pf_coil_lower[i] = pfv.zpf[i] - dx if pfv.zpf[i] < 0.0e0: - pfv.zl[i] = pfv.zpf[i] + dx + pfv.z_pf_coil_lower[i] = pfv.zpf[i] + dx pfv.z_pf_coil_upper[i] = pfv.zpf[i] + dx if pfv.zpf[i] < 0.0e0: @@ -695,7 +695,7 @@ def pfcoil(self): drpdz = ( pfv.r_pf_coil_outer[i] - pfv.r_pf_coil_inner[i] - + abs(pfv.z_pf_coil_upper[i] - pfv.zl[i]) + + abs(pfv.z_pf_coil_upper[i] - pfv.z_pf_coil_lower[i]) ) # dr + dz pfv.pfcaseth[i] = 0.25e0 * ( -drpdz + math.sqrt(drpdz * drpdz + 4.0e0 * areaspf) @@ -755,7 +755,7 @@ def pfcoil(self): # Plasma size and shape pfv.z_pf_coil_upper[pfv.nohc] = pv.rminor * pv.kappa - pfv.zl[pfv.nohc] = -pv.rminor * pv.kappa + pfv.z_pf_coil_lower[pfv.nohc] = -pv.rminor * pv.kappa pfv.r_pf_coil_inner[pfv.nohc] = pv.rmajor - pv.rminor pfv.r_pf_coil_outer[pfv.nohc] = pv.rmajor + pv.rminor pfv.turns[pfv.nohc] = 1.0e0 @@ -1000,7 +1000,7 @@ def ohcalc(self): # Z coordinates of coil edges pfv.z_pf_coil_upper[pfv.nohc - 1] = hohc - pfv.zl[pfv.nohc - 1] = -pfv.z_pf_coil_upper[pfv.nohc - 1] + pfv.z_pf_coil_lower[pfv.nohc - 1] = -pfv.z_pf_coil_upper[pfv.nohc - 1] # (R,Z) coordinates of coil centre pfv.r_pf_coil_middle[pfv.nohc - 1] = pfv.r_cs_middle @@ -1312,7 +1312,7 @@ def peakb(self, i, ii, it): # Self field from coil (Lyle's Method) kk = kk + 1 - dzpf = pfv.z_pf_coil_upper[jj - 1] - pfv.zl[jj - 1] + dzpf = pfv.z_pf_coil_upper[jj - 1] - pfv.z_pf_coil_lower[jj - 1] pf.rfxf[kk - 1] = pfv.r_pf_coil_middle[jj - 1] pf.zfxf[kk - 1] = pfv.zpf[jj - 1] + dzpf * 0.125e0 pf.cfxf[kk - 1] = ( @@ -1822,9 +1822,9 @@ def induct(self, output): if k < i: pfv.sxlg[i, k] = xc[k] * pfv.turns[k] * pfv.turns[i] elif k == i: - rl = abs(pfv.z_pf_coil_upper[k] - pfv.zl[k]) / math.sqrt( - constants.pi - ) + rl = abs( + pfv.z_pf_coil_upper[k] - pfv.z_pf_coil_lower[k] + ) / math.sqrt(constants.pi) pfv.sxlg[k, k] = ( constants.rmu0 * pfv.turns[k] ** 2 @@ -2354,7 +2354,7 @@ def outpf(self): for k in range(pf.nef): op.write( self.outfile, - f"PF {k}\t\t\t{pfv.r_pf_coil_middle[k]:.2e}\t{pfv.zpf[k]:.2e}\t{pfv.r_pf_coil_outer[k] - pfv.r_pf_coil_inner[k]:.2e}\t{abs(pfv.z_pf_coil_upper[k] - pfv.zl[k]):.2e}\t{pfv.turns[k]:.2e}", + f"PF {k}\t\t\t{pfv.r_pf_coil_middle[k]:.2e}\t{pfv.zpf[k]:.2e}\t{pfv.r_pf_coil_outer[k] - pfv.r_pf_coil_inner[k]:.2e}\t{abs(pfv.z_pf_coil_upper[k] - pfv.z_pf_coil_lower[k]):.2e}\t{pfv.turns[k]:.2e}", ) for k in range(pf.nef): @@ -2380,7 +2380,7 @@ def outpf(self): self.mfile, f"PF coil {k} vertical thickness (m)", f"(pfdz({k}))", - pfv.z_pf_coil_upper[k] - pfv.zl[k], + pfv.z_pf_coil_upper[k] - pfv.z_pf_coil_lower[k], ) op.ovarre( self.mfile, @@ -2406,7 +2406,7 @@ def outpf(self): if bv.iohcl != 0: op.write( self.outfile, - f"CS\t\t\t\t{pfv.r_pf_coil_middle[pfv.nohc - 1]:.2e}\t{pfv.zpf[pfv.nohc - 1]:.2e}\t{pfv.r_pf_coil_outer[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]:.2e}\t{abs(pfv.z_pf_coil_upper[pfv.nohc - 1] - pfv.zl[pfv.nohc - 1]):.2e}\t{pfv.turns[pfv.nohc - 1]:.2e}\t{pfv.pfcaseth[pfv.nohc - 1]:.2e}", + f"CS\t\t\t\t{pfv.r_pf_coil_middle[pfv.nohc - 1]:.2e}\t{pfv.zpf[pfv.nohc - 1]:.2e}\t{pfv.r_pf_coil_outer[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]:.2e}\t{abs(pfv.z_pf_coil_upper[pfv.nohc - 1] - pfv.z_pf_coil_lower[pfv.nohc - 1]):.2e}\t{pfv.turns[pfv.nohc - 1]:.2e}\t{pfv.pfcaseth[pfv.nohc - 1]:.2e}", ) op.ovarre( self.mfile, @@ -2430,7 +2430,7 @@ def outpf(self): self.mfile, "Central solenoid vertical thickness (m)", "(ohdz)", - (pfv.z_pf_coil_upper[pfv.nohc - 1] - pfv.zl[pfv.nohc - 1]), + (pfv.z_pf_coil_upper[pfv.nohc - 1] - pfv.z_pf_coil_lower[pfv.nohc - 1]), ) op.ovarre( self.mfile, diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index a1929ea4c6..04193bbd69 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -368,7 +368,7 @@ module pfcoil_variables real(dp), dimension(ngc2) :: z_pf_coil_upper !! upper point of PF coil i (m) - real(dp), dimension(ngc2) :: zl + real(dp), dimension(ngc2) :: z_pf_coil_lower !! lower point of PF coil i (m) real(dp), dimension(ngc2) :: zpf @@ -512,7 +512,7 @@ subroutine init_pfcoil_variables wtc = 0.0D0 wts = 0.0D0 z_pf_coil_upper = 0.0D0 - zl = 0.0D0 + z_pf_coil_lower = 0.0D0 zpf = 0.0D0 zref = (/3.6D0, 1.2D0, 2.5D0, & 1.0D0, 1.0D0, 1.0D0, 1.0D0, 1.0D0, 1.0D0, 1.0D0/) diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 845f492391..3953c00c84 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8652,7 +8652,7 @@ 0.0 ], "z_pf_coil_upper": 0.0, - "zl": 0.0, + "z_pf_coil_lower": 0.0, "zl1": 0.0, "zl2": 0.0, "zl3": 0.0, @@ -11233,7 +11233,7 @@ "zero": "", "zfxf": "", "z_pf_coil_upper": "upper point of PF coil i (m)", - "zl": "lower point of PF coil i (m)", + "z_pf_coil_lower": "lower point of PF coil i (m)", "zl1": "IFE vertical build below centre (m)", "zl2": "IFE vertical build below centre (m)", "zl3": "IFE vertical build below centre (m)", @@ -19009,7 +19009,7 @@ "wtc", "wts", "z_pf_coil_upper", - "zl", + "z_pf_coil_lower", "zpf", "zref", "bmaxcs_lim", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index c44341c74a..c1d5114e1c 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -82,7 +82,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "rpf2", -1.825) monkeypatch.setattr(pfv, "nfxfh", 7) monkeypatch.setattr(pfv, "bpf", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "zl", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "z_pf_coil_lower", np.full(22, 0.0)) monkeypatch.setattr(pfv, "wtc", np.full(22, 0.0)) monkeypatch.setattr(pfv, "vf", np.full(22, 3.0e-1)) monkeypatch.setattr(pfv, "turns", np.full(22, 0.0)) @@ -227,7 +227,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "cohbop", 1.693e7) monkeypatch.setattr(pfv, "z_pf_coil_upper", np.full(22, 0.0)) monkeypatch.setattr(pfv, "wtc", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "zl", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "z_pf_coil_lower", np.full(22, 0.0)) monkeypatch.setattr(pfv, "turns", np.full(22, 0.0)) monkeypatch.setattr(pfv, "wts", np.full(22, 0.0)) monkeypatch.setattr(pfv, "a_oh_turn", 0.0) @@ -2394,7 +2394,7 @@ def test_peakb(monkeypatch: pytest.MonkeyPatch, pfcoil: PFCoil): monkeypatch.setattr(pfv, "ncls", np.array([1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0])) monkeypatch.setattr( pfv, - "zl", + "z_pf_coil_lower", np.array([ 9.0273143460876444, -10.466339535104233, @@ -2867,7 +2867,7 @@ def test_induct(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): monkeypatch.setattr(pfv, "ncls", np.array([1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0])) monkeypatch.setattr( pfv, - "zl", + "z_pf_coil_lower", np.array([ 9.0273143460876444, -10.466339535104233, From 7462241ab291ae769a0b196ac80314ae3d3290c4 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 13:59:30 +0000 Subject: [PATCH 13/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'zpf'=20to=20'z?= =?UTF-8?q?=5Fpf=5Fcoil=5Fmiddle'=20across=20multiple=20files=20for=20cons?= =?UTF-8?q?istency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 14 +- examples/data/large_tokamak_1_MFILE.DAT | 14 +- examples/data/large_tokamak_2_MFILE.DAT | 14 +- examples/data/large_tokamak_3_MFILE.DAT | 14 +- examples/data/large_tokamak_4_MFILE.DAT | 14 +- examples/data/scan_MFILE.DAT | 126 +++++------ process/io/plot_proc.py | 2 +- process/pfcoil.py | 62 +++--- source/fortran/pfcoil_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 14 +- .../data/large_tokamak_2_MFILE.DAT | 14 +- .../data/large_tokamak_3_MFILE.DAT | 14 +- .../data/large_tokamak_4_MFILE.DAT | 14 +- .../integration/data/large_tokamak_MFILE.DAT | 14 +- tests/integration/data/scan_2D_MFILE.DAT | 210 +++++++++--------- tests/integration/data/scan_MFILE.DAT | 126 +++++------ tests/integration/ref_dicts.json | 6 +- tests/integration/test_pfcoil_int.py | 10 +- tests/unit/data/large_tokamak_MFILE.DAT | 14 +- 19 files changed, 350 insertions(+), 350 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 51eeba6492..a1dd8dc71b 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -822,49 +822,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3091E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3091E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2994E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2994E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6436E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8574E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6228E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0543E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0543E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3991E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3991E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.3830E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1532E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1259E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6706E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1273E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1273E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9061E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6244E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6246E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6706E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1273E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1273E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9061E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6244E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6246E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5180E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0922E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0922E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3097E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2388E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5758E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5180E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0922E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0922E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3097E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2388E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5758E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3365E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5551E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.4232E+03 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 2ca2fbbc46..b60d91f39e 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -817,49 +817,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3603E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0594E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6308E+03 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index ab6500ba41..72719829e7 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -817,49 +817,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3603E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0594E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6308E+03 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 41c7e565a7..4615b409cd 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -817,49 +817,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3603E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0594E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6308E+03 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 8fcd0084c7..e14d14c87d 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -817,49 +817,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3603E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0594E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6308E+03 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 93dc387777..48c4f12402 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -653,49 +653,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 - PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 + PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 - PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 + PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 - PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 + PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 - PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 + PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 - PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 + PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 - PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 + PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 @@ -1648,49 +1648,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 - PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 + PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 - PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 + PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 - PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 + PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 - PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 + PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 - PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 + PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 - PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 + PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 @@ -2643,49 +2643,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 - PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 + PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 - PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 + PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 - PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 + PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 - PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 + PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 - PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 + PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 - PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 + PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 @@ -3638,49 +3638,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 - PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 + PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 - PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 + PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 - PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 + PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 - PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 + PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 - PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 + PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 - PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 + PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 @@ -4633,49 +4633,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 - PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 + PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 - PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 + PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 - PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 + PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 - PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 + PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 - PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 + PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 - PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 + PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 @@ -5628,49 +5628,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 - PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 + PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 - PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 + PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 - PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 + PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 - PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 + PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 - PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 + PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 - PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 + PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 @@ -6623,49 +6623,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 - PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 + PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 - PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 + PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 - PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 + PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 - PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 + PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 - PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 + PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 - PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 + PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 @@ -7618,49 +7618,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 - PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 + PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 - PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 + PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 - PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 + PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 - PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 + PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 - PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 + PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 - PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 + PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 @@ -8613,49 +8613,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 - PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 + PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 - PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 + PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 - PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 + PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 - PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 + PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 - PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 + PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 - PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 + PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 2e9a07b073..789dda862d 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2201,7 +2201,7 @@ def plot_pf_coils(axis, mfile_data, scan, colour_scheme): for coil in range(noc): coils_r.append(mfile_data.data[f"r_pf_coil_middle[{coil:01}]"].get_scan(scan)) - coils_z.append(mfile_data.data[f"zpf[{coil:01}]"].get_scan(scan)) + coils_z.append(mfile_data.data[f"z_pf_coil_middle[{coil:01}]"].get_scan(scan)) coils_dr.append(mfile_data.data[f"pfdr({coil:01})"].get_scan(scan)) coils_dz.append(mfile_data.data[f"pfdz({coil:01})"].get_scan(scan)) coil_text.append(str(coil + 1)) diff --git a/process/pfcoil.py b/process/pfcoil.py index 863134fe5e..6cccbafce4 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -481,7 +481,7 @@ def pfcoil(self): for nng in range(pfv.ngrp): for ng2 in range(pfv.ncls[nng]): pfv.r_pf_coil_middle[ncl] = pf.rcls[nng, ng2] - pfv.zpf[ncl] = pf.zcls[nng, ng2] + pfv.z_pf_coil_middle[ncl] = pf.zcls[nng, ng2] # Currents at different times: @@ -553,14 +553,14 @@ def pfcoil(self): pfv.r_pf_coil_inner[i] = pfv.r_pf_coil_middle[i] - dx pfv.r_pf_coil_outer[i] = pfv.r_pf_coil_middle[i] + dx - pfv.z_pf_coil_lower[i] = pfv.zpf[i] - dz - if pfv.zpf[i] < 0.0e0: - pfv.z_pf_coil_lower[i] = pfv.zpf[i] + dz + pfv.z_pf_coil_lower[i] = pfv.z_pf_coil_middle[i] - dz + if pfv.z_pf_coil_middle[i] < 0.0e0: + pfv.z_pf_coil_lower[i] = pfv.z_pf_coil_middle[i] + dz - pfv.z_pf_coil_upper[i] = pfv.zpf[i] + dz + pfv.z_pf_coil_upper[i] = pfv.z_pf_coil_middle[i] + dz - if pfv.zpf[i] < 0.0e0: - pfv.z_pf_coil_upper[i] = pfv.zpf[i] - dz + if pfv.z_pf_coil_middle[i] < 0.0e0: + pfv.z_pf_coil_upper[i] = pfv.z_pf_coil_middle[i] - dz else: # Other coils. N.B. Current density RJCONPF[i] is defined in @@ -578,13 +578,13 @@ def pfcoil(self): pfv.r_pf_coil_inner[i] = pfv.r_pf_coil_middle[i] - dx pfv.r_pf_coil_outer[i] = pfv.r_pf_coil_middle[i] + dx - pfv.z_pf_coil_lower[i] = pfv.zpf[i] - dx - if pfv.zpf[i] < 0.0e0: - pfv.z_pf_coil_lower[i] = pfv.zpf[i] + dx + pfv.z_pf_coil_lower[i] = pfv.z_pf_coil_middle[i] - dx + if pfv.z_pf_coil_middle[i] < 0.0e0: + pfv.z_pf_coil_lower[i] = pfv.z_pf_coil_middle[i] + dx - pfv.z_pf_coil_upper[i] = pfv.zpf[i] + dx - if pfv.zpf[i] < 0.0e0: - pfv.z_pf_coil_upper[i] = pfv.zpf[i] - dx + pfv.z_pf_coil_upper[i] = pfv.z_pf_coil_middle[i] + dx + if pfv.z_pf_coil_middle[i] < 0.0e0: + pfv.z_pf_coil_upper[i] = pfv.z_pf_coil_middle[i] - dx # Outside radius of largest PF coil (m) pfv.pfrmax = max(pfv.pfrmax, pfv.r_pf_coil_outer[i]) @@ -1004,7 +1004,7 @@ def ohcalc(self): # (R,Z) coordinates of coil centre pfv.r_pf_coil_middle[pfv.nohc - 1] = pfv.r_cs_middle - pfv.zpf[pfv.nohc - 1] = 0.0e0 + pfv.z_pf_coil_middle[pfv.nohc - 1] = 0.0e0 # Radius of outer edge pfv.r_pf_coil_outer[pfv.nohc - 1] = pfv.r_cs_middle + 0.5e0 * bv.dr_cs @@ -1314,25 +1314,25 @@ def peakb(self, i, ii, it): dzpf = pfv.z_pf_coil_upper[jj - 1] - pfv.z_pf_coil_lower[jj - 1] pf.rfxf[kk - 1] = pfv.r_pf_coil_middle[jj - 1] - pf.zfxf[kk - 1] = pfv.zpf[jj - 1] + dzpf * 0.125e0 + pf.zfxf[kk - 1] = pfv.z_pf_coil_middle[jj - 1] + dzpf * 0.125e0 pf.cfxf[kk - 1] = ( pfv.ric[jj - 1] * pfv.waves[jj - 1, it - 1] * 0.25e6 ) kk = kk + 1 pf.rfxf[kk - 1] = pfv.r_pf_coil_middle[jj - 1] - pf.zfxf[kk - 1] = pfv.zpf[jj - 1] + dzpf * 0.375e0 + pf.zfxf[kk - 1] = pfv.z_pf_coil_middle[jj - 1] + dzpf * 0.375e0 pf.cfxf[kk - 1] = ( pfv.ric[jj - 1] * pfv.waves[jj - 1, it - 1] * 0.25e6 ) kk = kk + 1 pf.rfxf[kk - 1] = pfv.r_pf_coil_middle[jj - 1] - pf.zfxf[kk - 1] = pfv.zpf[jj - 1] - dzpf * 0.125e0 + pf.zfxf[kk - 1] = pfv.z_pf_coil_middle[jj - 1] - dzpf * 0.125e0 pf.cfxf[kk - 1] = ( pfv.ric[jj - 1] * pfv.waves[jj - 1, it - 1] * 0.25e6 ) kk = kk + 1 pf.rfxf[kk - 1] = pfv.r_pf_coil_middle[jj - 1] - pf.zfxf[kk - 1] = pfv.zpf[jj - 1] - dzpf * 0.375e0 + pf.zfxf[kk - 1] = pfv.z_pf_coil_middle[jj - 1] - dzpf * 0.375e0 pf.cfxf[kk - 1] = ( pfv.ric[jj - 1] * pfv.waves[jj - 1, it - 1] * 0.25e6 ) @@ -1341,7 +1341,7 @@ def peakb(self, i, ii, it): # Field from different coil kk = kk + 1 pf.rfxf[kk - 1] = pfv.r_pf_coil_middle[jj - 1] - pf.zfxf[kk - 1] = pfv.zpf[jj - 1] + pf.zfxf[kk - 1] = pfv.z_pf_coil_middle[jj - 1] pf.cfxf[kk - 1] = ( pfv.ric[jj - 1] * pfv.waves[jj - 1, it - 1] * 1.0e6 ) @@ -1360,14 +1360,14 @@ def peakb(self, i, ii, it): pf.zfxf[:kk], pf.cfxf[:kk], pfv.r_pf_coil_inner[i - 1], - pfv.zpf[i - 1], + pfv.z_pf_coil_middle[i - 1], ) pf.xind[:kk], bro, bzo, psi = bfield( pf.rfxf[:kk], pf.zfxf[:kk], pf.cfxf[:kk], pfv.r_pf_coil_outer[i - 1], - pfv.zpf[i - 1], + pfv.z_pf_coil_middle[i - 1], ) # bpf and bpf2 for the Central Solenoid are calculated in OHCALC @@ -1753,7 +1753,7 @@ def induct(self, output): xpfpl = 0.0 ncoils = ncoils + pfv.ncls[i] rp = pfv.r_pf_coil_middle[ncoils - 1] - zp = pfv.zpf[ncoils - 1] + zp = pfv.z_pf_coil_middle[ncoils - 1] xc, br, bz, psi = bfield(rc, zc, cc, rp, zp) for ii in range(nplas): xpfpl = xpfpl + xc[ii] @@ -1788,7 +1788,7 @@ def induct(self, output): xohpf = 0.0 ncoils = ncoils + pfv.ncls[i] rp = pfv.r_pf_coil_middle[ncoils - 1] - zp = pfv.zpf[ncoils - 1] + zp = pfv.z_pf_coil_middle[ncoils - 1] xc, br, bz, psi = bfield(rc, zc, cc, rp, zp) for ii in range(noh): xohpf = xohpf + xc[ii] @@ -1812,11 +1812,11 @@ def induct(self, output): for j in range(pf.nef - 1): jj = j + 1 + 1 if j >= i else j + 1 - zc[j] = pfv.zpf[jj - 1] + zc[j] = pfv.z_pf_coil_middle[jj - 1] rc[j] = pfv.r_pf_coil_middle[jj - 1] rp = pfv.r_pf_coil_middle[i] - zp = pfv.zpf[i] + zp = pfv.z_pf_coil_middle[i] xc, br, bz, psi = bfield(rc, zc, cc, rp, zp) for k in range(pf.nef): if k < i: @@ -2354,7 +2354,7 @@ def outpf(self): for k in range(pf.nef): op.write( self.outfile, - f"PF {k}\t\t\t{pfv.r_pf_coil_middle[k]:.2e}\t{pfv.zpf[k]:.2e}\t{pfv.r_pf_coil_outer[k] - pfv.r_pf_coil_inner[k]:.2e}\t{abs(pfv.z_pf_coil_upper[k] - pfv.z_pf_coil_lower[k]):.2e}\t{pfv.turns[k]:.2e}", + f"PF {k}\t\t\t{pfv.r_pf_coil_middle[k]:.2e}\t{pfv.z_pf_coil_middle[k]:.2e}\t{pfv.r_pf_coil_outer[k] - pfv.r_pf_coil_inner[k]:.2e}\t{abs(pfv.z_pf_coil_upper[k] - pfv.z_pf_coil_lower[k]):.2e}\t{pfv.turns[k]:.2e}", ) for k in range(pf.nef): @@ -2367,8 +2367,8 @@ def outpf(self): op.ovarre( self.mfile, f"PF coil {k} vertical position (m)", - f"(zpf[{k}])", - pfv.zpf[k], + f"(z_pf_coil_middle[{k}])", + pfv.z_pf_coil_middle[k], ) op.ovarre( self.mfile, @@ -2406,7 +2406,7 @@ def outpf(self): if bv.iohcl != 0: op.write( self.outfile, - f"CS\t\t\t\t{pfv.r_pf_coil_middle[pfv.nohc - 1]:.2e}\t{pfv.zpf[pfv.nohc - 1]:.2e}\t{pfv.r_pf_coil_outer[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]:.2e}\t{abs(pfv.z_pf_coil_upper[pfv.nohc - 1] - pfv.z_pf_coil_lower[pfv.nohc - 1]):.2e}\t{pfv.turns[pfv.nohc - 1]:.2e}\t{pfv.pfcaseth[pfv.nohc - 1]:.2e}", + f"CS\t\t\t\t{pfv.r_pf_coil_middle[pfv.nohc - 1]:.2e}\t{pfv.z_pf_coil_middle[pfv.nohc - 1]:.2e}\t{pfv.r_pf_coil_outer[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]:.2e}\t{abs(pfv.z_pf_coil_upper[pfv.nohc - 1] - pfv.z_pf_coil_lower[pfv.nohc - 1]):.2e}\t{pfv.turns[pfv.nohc - 1]:.2e}\t{pfv.pfcaseth[pfv.nohc - 1]:.2e}", ) op.ovarre( self.mfile, @@ -2417,8 +2417,8 @@ def outpf(self): op.ovarre( self.mfile, "Central solenoid vertical position (m)", - "(zpf[nohc-1])", - pfv.zpf[pfv.nohc - 1], + "(z_pf_coil_middle[nohc-1])", + pfv.z_pf_coil_middle[pfv.nohc - 1], ) op.ovarre( self.mfile, diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 04193bbd69..75b508d7a1 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -371,7 +371,7 @@ module pfcoil_variables real(dp), dimension(ngc2) :: z_pf_coil_lower !! lower point of PF coil i (m) - real(dp), dimension(ngc2) :: zpf + real(dp), dimension(ngc2) :: z_pf_coil_middle !! z (height) location of PF coil i (m) real(dp), dimension(n_pf_groups_max) :: zref @@ -513,7 +513,7 @@ subroutine init_pfcoil_variables wts = 0.0D0 z_pf_coil_upper = 0.0D0 z_pf_coil_lower = 0.0D0 - zpf = 0.0D0 + z_pf_coil_middle = 0.0D0 zref = (/3.6D0, 1.2D0, 2.5D0, & 1.0D0, 1.0D0, 1.0D0, 1.0D0, 1.0D0, 1.0D0, 1.0D0/) bmaxcs_lim = 13.0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 69aebfc0d9..84d1844631 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -816,49 +816,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3603E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0594E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6308E+03 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index e5bb1bd2ea..05ebb4498a 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -817,49 +817,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3603E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0594E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6308E+03 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index d6ddceb508..0960ab383d 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -817,49 +817,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3603E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0594E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6308E+03 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 14b090ccff..5cf08faca5 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -817,49 +817,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3603E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0594E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6308E+03 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 5693f31b02..8893625a76 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -820,49 +820,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 1.0000E+00 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3738E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3738E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2662E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2662E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4091E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7637E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.1628E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0608E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0608E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3575E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3575E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.0673E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0269E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6276E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6738E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1326E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1326E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9242E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6968E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6370E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6738E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1326E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1326E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9242E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6968E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6370E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5216E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0591E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0591E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.2990E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.1960E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5683E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5216E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0591E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0591E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.2990E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.1960E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5683E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2588E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7696E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6221E+03 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 4a49c7e7a2..3498e38b44 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -818,49 +818,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3191E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3191E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2937E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2937E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6029E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8411E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.5784E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0553E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0553E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3925E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3925E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.3326E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1330E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.0768E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6710E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1276E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1276E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9072E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6289E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6218E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6710E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1276E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1276E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9072E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6289E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6218E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5185E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0862E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0862E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3077E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2309E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5692E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5185E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0862E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0862E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3077E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2309E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5692E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3263E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5540E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6787E+03 @@ -1981,49 +1981,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3025E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3025E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3022E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3022E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6633E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8653E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6865E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0536E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0536E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4030E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4030E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4133E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1653E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1946E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6702E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1278E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1278E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9080E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6320E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6226E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6702E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1278E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1278E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9080E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6320E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6226E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5176E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1075E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1075E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3146E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2585E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5753E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5176E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1075E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1075E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3146E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2585E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5753E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3448E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5277E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6691E+03 @@ -3144,49 +3144,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.2890E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.2890E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3092E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3092E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.7137E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8855E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7779E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0523E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0523E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4117E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4117E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4806E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1923E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2939E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6695E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1277E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1277E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9075E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6299E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6223E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6695E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1277E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1277E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9075E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6299E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6223E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5168E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1222E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1222E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3194E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2776E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5793E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5168E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1222E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1222E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3194E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2776E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5793E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3583E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5352E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6652E+03 @@ -4307,49 +4307,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.2904E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.2904E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3091E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3091E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.7129E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8852E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7987E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0524E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0524E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4119E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4119E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4823E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1929E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.3157E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6695E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1276E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1276E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9072E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6289E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6217E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6695E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1276E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1276E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9072E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6289E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6217E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5169E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1200E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1200E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3187E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2748E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5786E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5169E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1200E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1200E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3187E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2748E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5786E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3569E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5349E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6617E+03 @@ -5470,49 +5470,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3025E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3025E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3027E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3027E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6670E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8668E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7021E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0536E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0536E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4038E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4038E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4193E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1677E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2112E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6702E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1287E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1287E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9110E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6438E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6247E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6702E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1287E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1287E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9110E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6438E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6247E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5176E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1138E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1138E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3167E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2667E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5777E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5176E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1138E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1138E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3167E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2667E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5777E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3448E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5266E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6732E+03 @@ -6633,49 +6633,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3197E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3197E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2942E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2942E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6062E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8425E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.5872E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0554E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0554E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3932E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3932E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.3377E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1351E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.0866E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6710E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1288E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1288E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9112E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6450E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6249E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6710E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1288E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1288E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9112E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6450E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6249E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5185E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0957E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0957E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3108E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2432E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5729E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5185E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0957E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0957E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3108E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2432E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5729E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3304E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4639E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6670E+03 @@ -7796,49 +7796,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3214E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3214E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2941E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2941E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6053E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8421E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6058E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0555E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0555E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3933E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3933E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.3389E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1356E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1061E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6711E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1288E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1288E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9113E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6453E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6246E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6711E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1288E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1288E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9113E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6453E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6246E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5186E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0942E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0942E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3103E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2413E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5724E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5186E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0942E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0942E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3103E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2413E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5724E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3294E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4494E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6619E+03 @@ -8959,49 +8959,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3066E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3066E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3013E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3013E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6568E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8627E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7117E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0541E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0541E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4025E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4025E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4094E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1638E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2208E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6704E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1281E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1281E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9089E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6357E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6226E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6704E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1281E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1281E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9089E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6357E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6226E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5178E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1059E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1059E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3141E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2565E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5749E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5178E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1059E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1059E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3141E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2565E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5749E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3439E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4622E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6621E+03 @@ -10122,49 +10122,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.2927E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.2927E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3076E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3076E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.7019E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8808E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.8179E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0527E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0527E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4108E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4108E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4731E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1892E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.3356E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6696E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1265E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1265E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9035E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6140E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6179E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6696E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1265E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1265E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9035E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6140E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6179E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5170E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1109E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1109E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3157E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2629E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5747E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5170E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1109E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1109E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3157E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2629E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5747E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3578E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4724E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6615E+03 @@ -11285,49 +11285,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.2934E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.2934E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3081E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3081E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.7053E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8821E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.8302E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0527E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0527E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4114E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4114E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4783E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1913E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.3487E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6697E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1274E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1274E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9066E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6263E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6202E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6697E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1274E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1274E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9066E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6263E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6202E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5171E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1164E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1164E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3175E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2700E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5770E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5171E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1164E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1164E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3175E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2700E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5770E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3570E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4720E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6601E+03 @@ -12448,49 +12448,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3075E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3075E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3023E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3023E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6640E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8656E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7247E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0541E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0541E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4037E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4037E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4184E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1674E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2346E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6704E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1294E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1294E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9134E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6535E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6262E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6704E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1294E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1294E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9134E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6535E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6262E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5179E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1140E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1140E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3167E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2670E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5783E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5179E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1140E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1140E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3167E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2670E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5783E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3426E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4697E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6609E+03 @@ -13611,49 +13611,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3220E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3220E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2960E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2960E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6187E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8475E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6307E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0556E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0556E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3956E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3956E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.3561E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1424E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1325E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6712E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1302E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1302E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9159E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6635E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6284E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6712E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1302E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1302E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9159E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6635E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6284E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5187E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1029E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1029E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3131E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2525E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5762E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5187E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1029E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1029E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3131E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2525E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5762E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3286E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4537E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6527E+03 @@ -14774,49 +14774,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3230E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3230E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2964E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2964E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6216E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8486E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6451E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0557E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0557E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3962E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3962E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.3608E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1443E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1478E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6712E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1309E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1309E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9184E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6735E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6303E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6712E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1309E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1309E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9184E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6735E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6303E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5187E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1069E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1069E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3145E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2578E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5780E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5187E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1069E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1069E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3145E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2578E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5780E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3276E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4535E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6506E+03 @@ -15937,49 +15937,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3081E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3081E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3038E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3038E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6745E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8698E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7386E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0542E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0542E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4053E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4053E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4312E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1725E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2496E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6704E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1310E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1310E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9188E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6753E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6307E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6704E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1310E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1310E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9188E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6753E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6307E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5179E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1247E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1247E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3202E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2808E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5828E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5179E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1247E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1247E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3202E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2808E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5828E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3422E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4673E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6556E+03 @@ -17100,49 +17100,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.2932E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.2932E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3112E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3112E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.7279E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8912E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.8313E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0527E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0527E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4145E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4145E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.5024E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.2010E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.3506E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6697E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1312E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1312E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9193E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6773E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6312E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6697E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1312E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1312E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9193E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6773E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6312E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5170E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1430E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1430E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3262E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.3046E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5879E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5170E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1430E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1430E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3262E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.3046E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5879E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3568E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4798E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6592E+03 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index dd8a25a50f..21a604c6e4 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -653,49 +653,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 - PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 + PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 - PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 + PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 - PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 + PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 - PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 + PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 - PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 + PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 - PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 + PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 @@ -1648,49 +1648,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 - PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 + PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 - PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 + PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 - PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 + PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 - PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 + PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 - PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 + PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 - PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 + PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 @@ -2643,49 +2643,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 - PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 + PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 - PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 + PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 - PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 + PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 - PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 + PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 - PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 + PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 - PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 + PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 @@ -3638,49 +3638,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 - PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 + PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 - PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 + PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 - PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 + PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 - PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 + PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 - PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 + PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 - PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 + PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 @@ -4633,49 +4633,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 - PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 + PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 - PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 + PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 - PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 + PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 - PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 + PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 - PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 + PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 - PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 + PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 @@ -5628,49 +5628,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 - PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 + PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 - PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 + PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 - PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 + PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 - PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 + PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 - PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 + PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 - PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 + PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 @@ -6623,49 +6623,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 - PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 + PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 - PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 + PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 - PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 + PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 - PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 + PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 - PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 + PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 - PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 + PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 @@ -7618,49 +7618,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 - PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 + PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 - PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 + PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 - PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 + PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 - PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 + PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 - PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 + PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 - PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 + PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 @@ -8613,49 +8613,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 6.6600E-01 PF_coil_01_radius_(m)___________________________________________________ (r_pf_coil_middle(01))_____________________ 6.4763E+00 - PF_coil_01_vertical_position_(m)________________________________________ (zpf(01))_____________________ 9.9877E+00 + PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 - PF_coil_02_vertical_position_(m)________________________________________ (zpf(02))_____________________ -1.1505E+01 + PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 - PF_coil_03_vertical_position_(m)________________________________________ (zpf(03))_____________________ 2.9606E+00 + PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 - PF_coil_04_vertical_position_(m)________________________________________ (zpf(04))_____________________ -2.9606E+00 + PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 - PF_coil_05_vertical_position_(m)________________________________________ (zpf(05))_____________________ 8.2897E+00 + PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 - PF_coil_06_vertical_position_(m)________________________________________ (zpf(06))_____________________ -8.2897E+00 + PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf(nohc))___________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 3953c00c84..dbb65dcc35 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8660,7 +8660,7 @@ "zl5": 0.0, "zl6": 0.0, "zl7": 0.0, - "zpf": 0.0, + "z_pf_coil_middle": 0.0, "zref": [ 3.6, 1.2, @@ -11241,7 +11241,7 @@ "zl5": "IFE vertical build below centre (m)", "zl6": "IFE vertical build below centre (m)", "zl7": "IFE vertical build below centre (m)", - "zpf": "z (height) location of PF coil i (m)", + "z_pf_coil_middle": "z (height) location of PF coil i (m)", "zref": "PF coil vertical positioning adjuster:\n
            \n
          • for groups j with i_pf_location(j) = 1; zref(j) is ignored
            • \n
          • for groups j with i_pf_location(j) = 2 AND itart=1 (only);\n zref(j) is distance of centre of PF coil from inside\n edge of TF coil (remember that PF coils for STs lie\n within the TF coil)
            • \n
          • for groups j with i_pf_location(j) = 3; zref(j) = ratio of\n height of coil group j to plasma minor radius
          • \n
        • for groups j with i_pf_location(j) = 4; zref(j) = ratio of\n height of coil group j to plasma minor radius
        • \n
      ", "zsearch": "", "zu1": "IFE vertical build above centre (m)", @@ -19010,7 +19010,7 @@ "wts", "z_pf_coil_upper", "z_pf_coil_lower", - "zpf", + "z_pf_coil_middle", "zref", "bmaxcs_lim", "fbmaxcs" diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index c1d5114e1c..e6fc262eb7 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -66,7 +66,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "ngrp", 4) monkeypatch.setattr(pfv, "r_cs_middle", 3.0) monkeypatch.setattr(pfv, "ncls", np.array([1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0])) - monkeypatch.setattr(pfv, "zpf", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "z_pf_coil_middle", np.full(22, 0.0)) monkeypatch.setattr(pfv, "cptdin", np.full(22, 4.22e4)) monkeypatch.setattr(pfv, "pfcaseth", np.full(22, 0.0)) monkeypatch.setattr(pfv, "itr_sum", 0.0) @@ -148,7 +148,7 @@ def test_pfcoil(monkeypatch, pfcoil): pfcoil.pfcoil() assert pytest.approx(pv.bvert) == -0.65121393 - assert pytest.approx(pfv.zpf) == np.array([ + assert pytest.approx(pfv.z_pf_coil_middle) == np.array([ 4.86, -4.86, 7.2075, @@ -217,7 +217,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "ric", np.full(22, 0.0)) monkeypatch.setattr(pfv, "bpf", np.full(22, 0.0)) monkeypatch.setattr(pfv, "jscoh_eof", 4.758e8) - monkeypatch.setattr(pfv, "zpf", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "z_pf_coil_middle", np.full(22, 0.0)) monkeypatch.setattr(pfv, "r_pf_coil_outer", np.full(22, 0.0)) monkeypatch.setattr(pfv, "r_pf_coil_inner", np.full(22, 0.0)) monkeypatch.setattr(pfv, "jscoh_bop", 3.562e8) @@ -2365,7 +2365,7 @@ def test_peakb(monkeypatch: pytest.MonkeyPatch, pfcoil: PFCoil): monkeypatch.setattr(pfv, "bpf", np.zeros(22, dtype=int)) # maybe monkeypatch.setattr( pfv, - "zpf", + "z_pf_coil_middle", np.array([ 9.606146709677418, -11.141090021562032, @@ -2807,7 +2807,7 @@ def test_induct(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): ) monkeypatch.setattr( pfv, - "zpf", + "z_pf_coil_middle", np.array([ 9.606146709677418, -11.141090021562032, diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index cf2be609e4..f3d57eaab7 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -820,49 +820,49 @@ Maximum_permissible_tensile_stress_(MPa)________________________________ (sigpfcalw)___________________ 5.0000E+02 JxB_hoop_force_fraction_supported_by_case_______________________________ (sigpfcf)_____________________ 1.0000E+00 PF_coil_0_radius_(m)____________________________________________________ (r_pf_coil_middle[0]_______________________ 5.5667E+00 - PF_coil_0_vertical_position_(m)_________________________________________ (zpf[0])______________________ 9.3738E+00 + PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3738E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2662E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2662E+00 PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4091E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7637E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.1628E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 - PF_coil_1_vertical_position_(m)_________________________________________ (zpf[1])______________________ -1.0608E+01 + PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0608E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3575E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3575E+00 PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.0673E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0269E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6276E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6738E+01 - PF_coil_2_vertical_position_(m)_________________________________________ (zpf[2])______________________ 2.6667E+00 + PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1326E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1326E+00 PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9242E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6968E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6370E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6738E+01 - PF_coil_3_vertical_position_(m)_________________________________________ (zpf[3])______________________ -2.6667E+00 + PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1326E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1326E+00 PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9242E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6968E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6370E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5216E+01 - PF_coil_4_vertical_position_(m)_________________________________________ (zpf[4])______________________ 7.4667E+00 + PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0591E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0591E-01 PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.2990E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.1960E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5683E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5216E+01 - PF_coil_5_vertical_position_(m)_________________________________________ (zpf[5])______________________ -7.4667E+00 + PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0591E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0591E-01 PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.2990E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.1960E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5683E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2588E+00 - Central_solenoid_vertical_position_(m)__________________________________ (zpf[nohc-1])_________________ 0.0000E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7696E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6221E+03 From 025d35df914af2dc112d07790e6525e6fa3a55b8 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 14:05:29 +0000 Subject: [PATCH 14/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'wtc'=20to=20'm?= =?UTF-8?q?=5Fpf=5Fcoil=5Fconductor'=20across=20multiple=20files=20for=20c?= =?UTF-8?q?onsistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 22 ++++++++++++---------- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/integration/test_pfcoil_int.py | 4 ++-- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index 6cccbafce4..6da017fabd 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -659,13 +659,15 @@ def pfcoil(self): # Conductor weight (vf is the void fraction) if pfv.i_pf_conductor == 0: - pfv.wtc[i] = ( + pfv.m_pf_coil_conductor[i] = ( volpf * tfv.dcond[pfv.i_pf_superconductor - 1] * (1.0e0 - pfv.vf[i]) ) else: - pfv.wtc[i] = volpf * constants.dcopper * (1.0e0 - pfv.vf[i]) + pfv.m_pf_coil_conductor[i] = ( + volpf * constants.dcopper * (1.0e0 - pfv.vf[i]) + ) # (J x B) force on coil @@ -719,7 +721,7 @@ def pfcoil(self): pfv.pfmmax = max( pfv.pfmmax, - (1.0e-3 * (pfv.wtc[i] + pfv.wts[i])), + (1.0e-3 * (pfv.m_pf_coil_conductor[i] + pfv.wts[i])), ) i = i + 1 @@ -749,7 +751,7 @@ def pfcoil(self): pf.ricpf = 0.0e0 for i in range(pfv.nohc): - pfv.whtpf = pfv.whtpf + pfv.wtc[i] + pfv.whtpf = pfv.whtpf + pfv.m_pf_coil_conductor[i] pfv.whtpfs = pfv.whtpfs + pfv.wts[i] pf.ricpf = pf.ricpf + abs(pfv.ric[i]) @@ -1172,7 +1174,7 @@ def ohcalc(self): # Weight of conductor in central Solenoid if pfv.i_pf_conductor == 0: - pfv.wtc[pfv.nohc - 1] = ( + pfv.m_pf_coil_conductor[pfv.nohc - 1] = ( pfv.awpoh * (1.0e0 - pfv.vfohc) * 2.0e0 @@ -1181,7 +1183,7 @@ def ohcalc(self): * tfv.dcond[pfv.i_cs_superconductor - 1] ) else: - pfv.wtc[pfv.nohc - 1] = ( + pfv.m_pf_coil_conductor[pfv.nohc - 1] = ( pfv.awpoh * (1.0e0 - pfv.vfohc) * 2.0e0 @@ -2475,12 +2477,12 @@ def outpf(self): if pfv.i_pf_conductor == 0: op.write( self.outfile, - f"PF {k}\t{pfv.ric[k]:.2e}\t{pfv.rjpfalw[k]:.2e}\t{pfv.rjconpf[k]:.2e}\t{pfv.rjconpf[k] / pfv.rjpfalw[k]:.2e}\t{pfv.wtc[k]:.2e}\t{pfv.wts[k]:.2e}\t{pfv.bpf[k]:.2e}", + f"PF {k}\t{pfv.ric[k]:.2e}\t{pfv.rjpfalw[k]:.2e}\t{pfv.rjconpf[k]:.2e}\t{pfv.rjconpf[k] / pfv.rjpfalw[k]:.2e}\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.wts[k]:.2e}\t{pfv.bpf[k]:.2e}", ) else: op.write( self.outfile, - f"PF {k}\t{pfv.ric[k]:.2e}\t-1.0e0\t{pfv.rjconpf[k]:.2e}\t1.0e0\t{pfv.wtc[k]:.2e}\t{pfv.wts[k]:.2e}\t{pfv.bpf[k]:.2e}\t", + f"PF {k}\t{pfv.ric[k]:.2e}\t-1.0e0\t{pfv.rjconpf[k]:.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.wts[k]:.2e}\t{pfv.bpf[k]:.2e}\t", ) # Central Solenoid, if present @@ -2489,12 +2491,12 @@ def outpf(self): # Issue #328 op.write( self.outfile, - f"CS\t\t{pfv.ric[pfv.nohc - 1]:.2e}\t{pfv.rjpfalw[pfv.nohc - 1]:.2e}\t{max(abs(pfv.cohbop), abs(pfv.coheof)):.2e}\t{max(abs(pfv.cohbop), abs(pfv.coheof)) / pfv.rjpfalw[pfv.nohc - 1]:.2e}\t{pfv.wtc[pfv.nohc - 1]:.2e}\t{pfv.wts[pfv.nohc - 1]:.2e}\t{pfv.bpf[pfv.nohc - 1]:.2e}", + f"CS\t\t{pfv.ric[pfv.nohc - 1]:.2e}\t{pfv.rjpfalw[pfv.nohc - 1]:.2e}\t{max(abs(pfv.cohbop), abs(pfv.coheof)):.2e}\t{max(abs(pfv.cohbop), abs(pfv.coheof)) / pfv.rjpfalw[pfv.nohc - 1]:.2e}\t{pfv.m_pf_coil_conductor[pfv.nohc - 1]:.2e}\t{pfv.wts[pfv.nohc - 1]:.2e}\t{pfv.bpf[pfv.nohc - 1]:.2e}", ) else: op.write( self.outfile, - f"CS\t\t{pfv.ric[pfv.nohc - 1]:.2e}\t-1.0e0\t{max(abs(pfv.cohbop)):.2e}\t{abs(pfv.coheof):.2e}\t1.0e0\t{pfv.wtc[pfv.nohc - 1]:.2e}\t{pfv.wts[pfv.nohc - 1]:.2e}\t{pfv.bpf[pfv.nohc - 1]:.2e}", + f"CS\t\t{pfv.ric[pfv.nohc - 1]:.2e}\t-1.0e0\t{max(abs(pfv.cohbop)):.2e}\t{abs(pfv.coheof):.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[pfv.nohc - 1]:.2e}\t{pfv.wts[pfv.nohc - 1]:.2e}\t{pfv.bpf[pfv.nohc - 1]:.2e}", ) # Miscellaneous totals diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 75b508d7a1..125c7f4cfa 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -359,7 +359,7 @@ module pfcoil_variables real(dp) :: whtpfs !! total mass of the PF coil structure (kg) - real(dp), dimension(ngc2) :: wtc + real(dp), dimension(ngc2) :: m_pf_coil_conductor !! conductor mass for PF coil i (kg) real(dp), dimension(ngc2) :: wts @@ -509,7 +509,7 @@ subroutine init_pfcoil_variables waves = 0.0D0 whtpf = 0.0D0 whtpfs = 0.0D0 - wtc = 0.0D0 + m_pf_coil_conductor = 0.0D0 wts = 0.0D0 z_pf_coil_upper = 0.0D0 z_pf_coil_lower = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index dbb65dcc35..80879e7703 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8077,7 +8077,7 @@ "wsvol": 0.0, "wtblli2o": 0.0, "wtbllipb": 0.0, - "wtc": 0.0, + "m_pf_coil_conductor": 0.0, "wtgpd": 0.0, "wts": 0.0, "wtshldi": 0.0, @@ -11186,7 +11186,7 @@ "wsvol": "volume of warm shop building (m3)", "wtblli2o": "mass of blanket - Li_2O part (kg)", "wtbllipb": "mass of blanket - Li-Pb part (kg)", - "wtc": "conductor mass for PF coil i (kg)", + "m_pf_coil_conductor": "conductor mass for PF coil i (kg)", "wtgpd": "mass of fuel used per day (g)", "wts": "structure mass for PF coil i (kg)", "wtshldi": "mass of inboard shield (kg)", @@ -19006,7 +19006,7 @@ "waves", "whtpf", "whtpfs", - "wtc", + "m_pf_coil_conductor", "wts", "z_pf_coil_upper", "z_pf_coil_lower", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index e6fc262eb7..1b59fcddae 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -83,7 +83,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "nfxfh", 7) monkeypatch.setattr(pfv, "bpf", np.full(22, 0.0)) monkeypatch.setattr(pfv, "z_pf_coil_lower", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "wtc", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "m_pf_coil_conductor", np.full(22, 0.0)) monkeypatch.setattr(pfv, "vf", np.full(22, 3.0e-1)) monkeypatch.setattr(pfv, "turns", np.full(22, 0.0)) monkeypatch.setattr(pfv, "curpfs", np.full(22, 0.0)) @@ -226,7 +226,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "r_pf_coil_middle", np.full(22, 0.0)) monkeypatch.setattr(pfv, "cohbop", 1.693e7) monkeypatch.setattr(pfv, "z_pf_coil_upper", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "wtc", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "m_pf_coil_conductor", np.full(22, 0.0)) monkeypatch.setattr(pfv, "z_pf_coil_lower", np.full(22, 0.0)) monkeypatch.setattr(pfv, "turns", np.full(22, 0.0)) monkeypatch.setattr(pfv, "wts", np.full(22, 0.0)) From f6dcb3ea3eff754cbfa5d8e4320a229df7d092d1 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 14:12:55 +0000 Subject: [PATCH 15/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'whtpf'=20to=20'm?= =?UTF-8?q?=5Fpf=5Fcoil=5Fconductor=5Ftotal'=20across=20multiple=20files?= =?UTF-8?q?=20for=20consistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 8 +++++--- process/structure.py | 2 +- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/integration/test_pfcoil_int.py | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index 6da017fabd..d1693df117 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -746,12 +746,14 @@ def pfcoil(self): self.ohcalc() # Summation of weights and current - pfv.whtpf = 0.0e0 + pfv.m_pf_coil_conductor_total = 0.0e0 pfv.whtpfs = 0.0e0 pf.ricpf = 0.0e0 for i in range(pfv.nohc): - pfv.whtpf = pfv.whtpf + pfv.m_pf_coil_conductor[i] + pfv.m_pf_coil_conductor_total = ( + pfv.m_pf_coil_conductor_total + pfv.m_pf_coil_conductor[i] + ) pfv.whtpfs = pfv.whtpfs + pfv.wts[i] pf.ricpf = pf.ricpf + abs(pfv.ric[i]) @@ -2510,7 +2512,7 @@ def outpf(self): "\t" * 1 + f"{pf.ricpf:.2e}" + "\t" * 7 - + f"{pfv.whtpf:.2e}\t{pfv.whtpfs:.2e}", + + f"{pfv.m_pf_coil_conductor_total:.2e}\t{pfv.whtpfs:.2e}", ) op.osubhd(self.outfile, "PF coil current scaling information :") diff --git a/process/structure.py b/process/structure.py index d9cafc1c45..06841e8607 100644 --- a/process/structure.py +++ b/process/structure.py @@ -39,7 +39,7 @@ def run(self, output: bool = False) -> None: """ # Total weight of the PF coil conductor and its structure - total_weight_pf = pfv.whtpf + pfv.whtpfs + total_weight_pf = pfv.m_pf_coil_conductor_total + pfv.whtpfs ( stv.fncmass, diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 125c7f4cfa..839bdf4d54 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -353,7 +353,7 @@ module pfcoil_variables real(dp), dimension(ngc2,6) :: waves !! used in current waveform of PF coils/central solenoid - real(dp) :: whtpf + real(dp) :: m_pf_coil_conductor_total !! total mass of the PF coil conductor (kg) real(dp) :: whtpfs @@ -507,7 +507,7 @@ subroutine init_pfcoil_variables vssu = 0.0D0 vstot = 0.0D0 waves = 0.0D0 - whtpf = 0.0D0 + m_pf_coil_conductor_total = 0.0D0 whtpfs = 0.0D0 m_pf_coil_conductor = 0.0D0 wts = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 80879e7703..b5d6df6e99 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8058,7 +8058,7 @@ "whtconsh": 0.0, "whtcp": 0.0, "whtgw": 0.0, - "whtpf": 0.0, + "m_pf_coil_conductor_total": 0.0, "whtpfs": 0.0, "whtshld": 0.0, "whttf": 0.0, @@ -11167,7 +11167,7 @@ "whtconsh": "steel conduit mass in TF coil conductor (kg/coil)", "whtcp": "mass of TF coil inboard legs (kg)", "whtgw": "mass of ground-wall insulation layer per coil (kg/coil)", - "whtpf": "total mass of the PF coil conductor (kg)", + "m_pf_coil_conductor_total": "total mass of the PF coil conductor (kg)", "whtpfs": "total mass of the PF coil structure (kg)", "whtshld": "mass of shield (kg)", "whttf": "total mass of the TF coils (kg)", @@ -19004,7 +19004,7 @@ "vssu", "vstot", "waves", - "whtpf", + "m_pf_coil_conductor_total", "whtpfs", "m_pf_coil_conductor", "wts", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 1b59fcddae..188e7ffe71 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -105,7 +105,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "r_pf_coil_outer", np.full(22, 0.0)) monkeypatch.setattr(pfv, "i_pf_superconductor", 3) monkeypatch.setattr(pfv, "i_cs_superconductor", 1) - monkeypatch.setattr(pfv, "whtpf", 0.0) + monkeypatch.setattr(pfv, "m_pf_coil_conductor_total", 0.0) monkeypatch.setattr(pfv, "fcupfsu", 6.900e-1) monkeypatch.setattr(pfv, "cohbop", 1.693e7) monkeypatch.setattr(pfv, "rjpfalw", np.full(22, 0.0)) From 5657120c94b50b2fbf960d16512dc4cd1e2d36a2 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 14:15:38 +0000 Subject: [PATCH 16/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'whtpfs'=20to=20'?= =?UTF-8?q?m=5Fpf=5Fcoil=5Fstructure=5Ftotal'=20across=20multiple=20files?= =?UTF-8?q?=20for=20consistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/costs.py | 4 +++- process/pfcoil.py | 6 +++--- process/structure.py | 2 +- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/integration/test_pfcoil_int.py | 2 +- tests/unit/test_costs_1990.py | 14 +++++++++----- 7 files changed, 22 insertions(+), 16 deletions(-) diff --git a/process/costs.py b/process/costs.py index c731443b8a..96e3f5e1da 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1731,7 +1731,9 @@ def acc2222(self): # Account 222.2.3 : Steel case - will be zero for resistive coils - self.c22223 = 1.0e-6 * cost_variables.uccase * pfcoil_variables.whtpfs + self.c22223 = ( + 1.0e-6 * cost_variables.uccase * pfcoil_variables.m_pf_coil_structure_total + ) self.c22223 = cost_variables.fkind * self.c22223 * cmlsa[cost_variables.lsa - 1] # Account 222.2.4 : Support structure diff --git a/process/pfcoil.py b/process/pfcoil.py index d1693df117..cee08e0c8c 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -747,14 +747,14 @@ def pfcoil(self): # Summation of weights and current pfv.m_pf_coil_conductor_total = 0.0e0 - pfv.whtpfs = 0.0e0 + pfv.m_pf_coil_structure_total = 0.0e0 pf.ricpf = 0.0e0 for i in range(pfv.nohc): pfv.m_pf_coil_conductor_total = ( pfv.m_pf_coil_conductor_total + pfv.m_pf_coil_conductor[i] ) - pfv.whtpfs = pfv.whtpfs + pfv.wts[i] + pfv.m_pf_coil_structure_total = pfv.m_pf_coil_structure_total + pfv.wts[i] pf.ricpf = pf.ricpf + abs(pfv.ric[i]) # Plasma size and shape @@ -2512,7 +2512,7 @@ def outpf(self): "\t" * 1 + f"{pf.ricpf:.2e}" + "\t" * 7 - + f"{pfv.m_pf_coil_conductor_total:.2e}\t{pfv.whtpfs:.2e}", + + f"{pfv.m_pf_coil_conductor_total:.2e}\t{pfv.m_pf_coil_structure_total:.2e}", ) op.osubhd(self.outfile, "PF coil current scaling information :") diff --git a/process/structure.py b/process/structure.py index 06841e8607..6b5b0cad0c 100644 --- a/process/structure.py +++ b/process/structure.py @@ -39,7 +39,7 @@ def run(self, output: bool = False) -> None: """ # Total weight of the PF coil conductor and its structure - total_weight_pf = pfv.m_pf_coil_conductor_total + pfv.whtpfs + total_weight_pf = pfv.m_pf_coil_conductor_total + pfv.m_pf_coil_structure_total ( stv.fncmass, diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 839bdf4d54..336f5e5080 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -356,7 +356,7 @@ module pfcoil_variables real(dp) :: m_pf_coil_conductor_total !! total mass of the PF coil conductor (kg) - real(dp) :: whtpfs + real(dp) :: m_pf_coil_structure_total !! total mass of the PF coil structure (kg) real(dp), dimension(ngc2) :: m_pf_coil_conductor @@ -508,7 +508,7 @@ subroutine init_pfcoil_variables vstot = 0.0D0 waves = 0.0D0 m_pf_coil_conductor_total = 0.0D0 - whtpfs = 0.0D0 + m_pf_coil_structure_total = 0.0D0 m_pf_coil_conductor = 0.0D0 wts = 0.0D0 z_pf_coil_upper = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index b5d6df6e99..9920d23742 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8059,7 +8059,7 @@ "whtcp": 0.0, "whtgw": 0.0, "m_pf_coil_conductor_total": 0.0, - "whtpfs": 0.0, + "m_pf_coil_structure_total": 0.0, "whtshld": 0.0, "whttf": 0.0, "whttflgs": 0.0, @@ -11168,7 +11168,7 @@ "whtcp": "mass of TF coil inboard legs (kg)", "whtgw": "mass of ground-wall insulation layer per coil (kg/coil)", "m_pf_coil_conductor_total": "total mass of the PF coil conductor (kg)", - "whtpfs": "total mass of the PF coil structure (kg)", + "m_pf_coil_structure_total": "total mass of the PF coil structure (kg)", "whtshld": "mass of shield (kg)", "whttf": "total mass of the TF coils (kg)", "whttflgs": "mass of the TF coil legs (kg)", @@ -19005,7 +19005,7 @@ "vstot", "waves", "m_pf_coil_conductor_total", - "whtpfs", + "m_pf_coil_structure_total", "m_pf_coil_conductor", "wts", "z_pf_coil_upper", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 188e7ffe71..487e68f566 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -57,7 +57,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(eh, "idiags", np.full(8, -999999)) monkeypatch.setattr(fwbsv, "denstl", 7.8e3) monkeypatch.setattr(pfv, "rpf1", 0.0) - monkeypatch.setattr(pfv, "whtpfs", 0.0) + monkeypatch.setattr(pfv, "m_pf_coil_structure_total", 0.0) monkeypatch.setattr(pfv, "curpff", np.full(22, 0.0)) monkeypatch.setattr(pfv, "nohc", 0) monkeypatch.setattr(pfv, "pfrmax", 0.0) diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 39a5bc7ae2..edce4ab75f 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -2036,7 +2036,7 @@ class Acc2222Param(NamedTuple): i_pf_superconductor: Any = None - whtpfs: Any = None + m_pf_coil_structure_total: Any = None ric: Any = None @@ -2163,7 +2163,7 @@ class Acc2222Param(NamedTuple): order="F", ).transpose(), i_pf_superconductor=3, - whtpfs=2695737.563343476, + m_pf_coil_structure_total=2695737.563343476, ric=np.array( np.array( ( @@ -2359,7 +2359,7 @@ class Acc2222Param(NamedTuple): order="F", ).transpose(), i_pf_superconductor=3, - whtpfs=2510424.9065680322, + m_pf_coil_structure_total=2510424.9065680322, ric=np.array( np.array( ( @@ -2555,7 +2555,7 @@ class Acc2222Param(NamedTuple): order="F", ).transpose(), i_pf_superconductor=3, - whtpfs=2510424.9065680322, + m_pf_coil_structure_total=2510424.9065680322, ric=np.array( np.array( ( @@ -2727,7 +2727,11 @@ def test_acc2222(acc2222param, monkeypatch, costs): pfcoil_variables, "i_pf_superconductor", acc2222param.i_pf_superconductor ) - monkeypatch.setattr(pfcoil_variables, "whtpfs", acc2222param.whtpfs) + monkeypatch.setattr( + pfcoil_variables, + "m_pf_coil_structure_total", + acc2222param.m_pf_coil_structure_total, + ) monkeypatch.setattr(pfcoil_variables, "ric", acc2222param.ric) From 55205c334137144f45bfefc6a0c2eb99dfb5cbe3 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 14:16:52 +0000 Subject: [PATCH 17/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'wts'=20to=20'm?= =?UTF-8?q?=5Fpf=5Fcoil=5Fstructure'=20across=20multiple=20files=20for=20c?= =?UTF-8?q?onsistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 21 +++++++++++++-------- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/integration/test_pfcoil_int.py | 4 ++-- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index cee08e0c8c..3de5ece109 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -709,7 +709,7 @@ def pfcoil(self): # Weight of steel case - pfv.wts[i] = ( + pfv.m_pf_coil_structure[i] = ( areaspf * 2.0e0 * constants.pi @@ -721,7 +721,10 @@ def pfcoil(self): pfv.pfmmax = max( pfv.pfmmax, - (1.0e-3 * (pfv.m_pf_coil_conductor[i] + pfv.wts[i])), + ( + 1.0e-3 + * (pfv.m_pf_coil_conductor[i] + pfv.m_pf_coil_structure[i]) + ), ) i = i + 1 @@ -754,7 +757,9 @@ def pfcoil(self): pfv.m_pf_coil_conductor_total = ( pfv.m_pf_coil_conductor_total + pfv.m_pf_coil_conductor[i] ) - pfv.m_pf_coil_structure_total = pfv.m_pf_coil_structure_total + pfv.wts[i] + pfv.m_pf_coil_structure_total = ( + pfv.m_pf_coil_structure_total + pfv.m_pf_coil_structure[i] + ) pf.ricpf = pf.ricpf + abs(pfv.ric[i]) # Plasma size and shape @@ -1156,7 +1161,7 @@ def ohcalc(self): pfv.pfcaseth[pfv.nohc - 1] = 0.0e0 # Weight of steel - pfv.wts[pfv.nohc - 1] = ( + pfv.m_pf_coil_structure[pfv.nohc - 1] = ( areaspf * 2.0e0 * constants.pi @@ -2479,12 +2484,12 @@ def outpf(self): if pfv.i_pf_conductor == 0: op.write( self.outfile, - f"PF {k}\t{pfv.ric[k]:.2e}\t{pfv.rjpfalw[k]:.2e}\t{pfv.rjconpf[k]:.2e}\t{pfv.rjconpf[k] / pfv.rjpfalw[k]:.2e}\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.wts[k]:.2e}\t{pfv.bpf[k]:.2e}", + f"PF {k}\t{pfv.ric[k]:.2e}\t{pfv.rjpfalw[k]:.2e}\t{pfv.rjconpf[k]:.2e}\t{pfv.rjconpf[k] / pfv.rjpfalw[k]:.2e}\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.m_pf_coil_structure[k]:.2e}\t{pfv.bpf[k]:.2e}", ) else: op.write( self.outfile, - f"PF {k}\t{pfv.ric[k]:.2e}\t-1.0e0\t{pfv.rjconpf[k]:.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.wts[k]:.2e}\t{pfv.bpf[k]:.2e}\t", + f"PF {k}\t{pfv.ric[k]:.2e}\t-1.0e0\t{pfv.rjconpf[k]:.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.m_pf_coil_structure[k]:.2e}\t{pfv.bpf[k]:.2e}\t", ) # Central Solenoid, if present @@ -2493,12 +2498,12 @@ def outpf(self): # Issue #328 op.write( self.outfile, - f"CS\t\t{pfv.ric[pfv.nohc - 1]:.2e}\t{pfv.rjpfalw[pfv.nohc - 1]:.2e}\t{max(abs(pfv.cohbop), abs(pfv.coheof)):.2e}\t{max(abs(pfv.cohbop), abs(pfv.coheof)) / pfv.rjpfalw[pfv.nohc - 1]:.2e}\t{pfv.m_pf_coil_conductor[pfv.nohc - 1]:.2e}\t{pfv.wts[pfv.nohc - 1]:.2e}\t{pfv.bpf[pfv.nohc - 1]:.2e}", + f"CS\t\t{pfv.ric[pfv.nohc - 1]:.2e}\t{pfv.rjpfalw[pfv.nohc - 1]:.2e}\t{max(abs(pfv.cohbop), abs(pfv.coheof)):.2e}\t{max(abs(pfv.cohbop), abs(pfv.coheof)) / pfv.rjpfalw[pfv.nohc - 1]:.2e}\t{pfv.m_pf_coil_conductor[pfv.nohc - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.nohc - 1]:.2e}\t{pfv.bpf[pfv.nohc - 1]:.2e}", ) else: op.write( self.outfile, - f"CS\t\t{pfv.ric[pfv.nohc - 1]:.2e}\t-1.0e0\t{max(abs(pfv.cohbop)):.2e}\t{abs(pfv.coheof):.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[pfv.nohc - 1]:.2e}\t{pfv.wts[pfv.nohc - 1]:.2e}\t{pfv.bpf[pfv.nohc - 1]:.2e}", + f"CS\t\t{pfv.ric[pfv.nohc - 1]:.2e}\t-1.0e0\t{max(abs(pfv.cohbop)):.2e}\t{abs(pfv.coheof):.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[pfv.nohc - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.nohc - 1]:.2e}\t{pfv.bpf[pfv.nohc - 1]:.2e}", ) # Miscellaneous totals diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 336f5e5080..bcc11c386e 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -362,7 +362,7 @@ module pfcoil_variables real(dp), dimension(ngc2) :: m_pf_coil_conductor !! conductor mass for PF coil i (kg) - real(dp), dimension(ngc2) :: wts + real(dp), dimension(ngc2) :: m_pf_coil_structure !! structure mass for PF coil i (kg) real(dp), dimension(ngc2) :: z_pf_coil_upper @@ -510,7 +510,7 @@ subroutine init_pfcoil_variables m_pf_coil_conductor_total = 0.0D0 m_pf_coil_structure_total = 0.0D0 m_pf_coil_conductor = 0.0D0 - wts = 0.0D0 + m_pf_coil_structure = 0.0D0 z_pf_coil_upper = 0.0D0 z_pf_coil_lower = 0.0D0 z_pf_coil_middle = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 9920d23742..13bf55645b 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8079,7 +8079,7 @@ "wtbllipb": 0.0, "m_pf_coil_conductor": 0.0, "wtgpd": 0.0, - "wts": 0.0, + "m_pf_coil_structure": 0.0, "wtshldi": 0.0, "wtshldo": 0.0, "wwp1": 0.0, @@ -11188,7 +11188,7 @@ "wtbllipb": "mass of blanket - Li-Pb part (kg)", "m_pf_coil_conductor": "conductor mass for PF coil i (kg)", "wtgpd": "mass of fuel used per day (g)", - "wts": "structure mass for PF coil i (kg)", + "m_pf_coil_structure": "structure mass for PF coil i (kg)", "wtshldi": "mass of inboard shield (kg)", "wtshldo": "mass of outboard shield (kg)", "wwp1": "width of first step of winding pack (m)", @@ -19007,7 +19007,7 @@ "m_pf_coil_conductor_total", "m_pf_coil_structure_total", "m_pf_coil_conductor", - "wts", + "m_pf_coil_structure", "z_pf_coil_upper", "z_pf_coil_lower", "z_pf_coil_middle", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 487e68f566..67561f0f3b 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -73,7 +73,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "sigpfcf", 6.66e-1) monkeypatch.setattr(pfv, "ohhghf", 9.0e-1) monkeypatch.setattr(pfv, "i_pf_location", np.array([2, 2, 3, 3, 0, 0, 0, 0, 0, 0])) - monkeypatch.setattr(pfv, "wts", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "m_pf_coil_structure", np.full(22, 0.0)) monkeypatch.setattr(pfv, "powpfres", 0.0) monkeypatch.setattr(pfv, "curpfb", np.full(22, 0.0)) monkeypatch.setattr(pfv, "routr", 1.5) @@ -229,7 +229,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "m_pf_coil_conductor", np.full(22, 0.0)) monkeypatch.setattr(pfv, "z_pf_coil_lower", np.full(22, 0.0)) monkeypatch.setattr(pfv, "turns", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "wts", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "m_pf_coil_structure", np.full(22, 0.0)) monkeypatch.setattr(pfv, "a_oh_turn", 0.0) monkeypatch.setattr(tfv, "dcond", np.full(9, 9.0e3)) monkeypatch.setattr(tfv, "tftmp", 4.750) From f8b31a447424d55c32f0b60fc1412f547200226a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 14:34:21 +0000 Subject: [PATCH 18/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'turns'=20to=20'n?= =?UTF-8?q?=5Fpf=5Fcoil=5Fturns'=20across=20multiple=20files=20for=20consi?= =?UTF-8?q?stency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 14 +- examples/data/large_tokamak_1_MFILE.DAT | 14 +- examples/data/large_tokamak_2_MFILE.DAT | 14 +- examples/data/large_tokamak_3_MFILE.DAT | 14 +- examples/data/large_tokamak_4_MFILE.DAT | 14 +- examples/data/scan_MFILE.DAT | 126 +++++------ process/costs.py | 21 +- process/pfcoil.py | 86 ++++--- process/power.py | 6 +- process/pulse.py | 6 +- source/fortran/pfcoil_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 14 +- .../data/large_tokamak_2_MFILE.DAT | 14 +- .../data/large_tokamak_3_MFILE.DAT | 14 +- .../data/large_tokamak_4_MFILE.DAT | 14 +- .../integration/data/large_tokamak_MFILE.DAT | 14 +- tests/integration/data/scan_2D_MFILE.DAT | 210 +++++++++--------- tests/integration/data/scan_MFILE.DAT | 126 +++++------ tests/integration/ref_dicts.json | 4 +- tests/unit/data/large_tokamak_MFILE.DAT | 14 +- tests/unit/test_costs_1990.py | 12 +- tests/unit/test_power.py | 8 +- tests/unit/test_pulse.py | 10 +- 23 files changed, 398 insertions(+), 375 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index a1dd8dc71b..dc2d53f962 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -825,49 +825,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3091E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2994E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2994E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6436E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6436E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8574E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6228E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0543E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3991E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3991E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.3830E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.3830E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1532E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1259E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6706E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1273E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1273E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9061E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9061E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6244E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6246E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6706E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1273E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1273E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9061E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9061E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6244E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6246E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5180E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0922E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0922E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3097E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3097E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2388E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5758E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5180E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0922E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0922E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3097E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3097E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2388E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5758E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3365E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5551E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.4232E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.4232E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.7693E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.3997E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8915E-04 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index b60d91f39e..b90fb16dc3 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -820,49 +820,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6308E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6308E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8523E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 72719829e7..75ec53d94b 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -820,49 +820,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6308E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6308E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8523E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 4615b409cd..73ccb0deda 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -820,49 +820,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6308E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6308E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8523E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index e14d14c87d..8ca12d1ac8 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -820,49 +820,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6308E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6308E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8523E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 48c4f12402..98787ab26f 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -656,49 +656,49 @@ PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 - PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 + PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 - PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 + PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 - PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 + PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 - PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 + PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 - PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 + PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 - PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 + PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP @@ -1651,49 +1651,49 @@ PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 - PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 + PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 - PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 + PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 - PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 + PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 - PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 + PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 - PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 + PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 - PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 + PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP @@ -2646,49 +2646,49 @@ PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 - PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 + PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 - PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 + PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 - PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 + PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 - PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 + PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 - PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 + PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 - PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 + PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP @@ -3641,49 +3641,49 @@ PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 - PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 + PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 - PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 + PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 - PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 + PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 - PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 + PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 - PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 + PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 - PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 + PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP @@ -4636,49 +4636,49 @@ PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 - PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 + PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 - PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 + PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 - PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 + PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 - PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 + PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 - PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 + PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 - PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 + PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP @@ -5631,49 +5631,49 @@ PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 - PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 + PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 - PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 + PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 - PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 + PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 - PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 + PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 - PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 + PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 - PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 + PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP @@ -6626,49 +6626,49 @@ PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 - PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 + PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 - PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 + PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 - PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 + PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 - PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 + PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 - PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 + PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 - PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 + PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP @@ -7621,49 +7621,49 @@ PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 - PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 + PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 - PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 + PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 - PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 + PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 - PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 + PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 - PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 + PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 - PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 + PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP @@ -8616,49 +8616,49 @@ PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 - PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 + PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 - PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 + PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 - PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 + PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 - PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 + PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 - PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 + PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 - PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 + PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP diff --git a/process/costs.py b/process/costs.py index 96e3f5e1da..d8f1f3b988 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1558,7 +1558,7 @@ def acc2222(self): pfwndl + constants.twopi * pfcoil_variables.r_pf_coil_middle[i] - * pfcoil_variables.turns[i] + * pfcoil_variables.n_pf_coil_turns[i] ) # Account 222.2.1 : Conductor @@ -1588,7 +1588,10 @@ def acc2222(self): cost_variables.ucsc[pfcoil_variables.i_pf_superconductor - 1] * (1.0e0 - pfcoil_variables.fcupfsu) * (1.0e0 - pfcoil_variables.vf[i]) - * abs(pfcoil_variables.ric[i] / pfcoil_variables.turns[i]) + * abs( + pfcoil_variables.ric[i] + / pfcoil_variables.n_pf_coil_turns[i] + ) * 1.0e6 / pfcoil_variables.rjconpf[i] * tfcoil_variables.dcond[ @@ -1617,7 +1620,7 @@ def acc2222(self): cost_variables.uccu * pfcoil_variables.fcupfsu * (1.0e0 - pfcoil_variables.vf[i]) - * abs(pfcoil_variables.ric[i] / pfcoil_variables.turns[i]) + * abs(pfcoil_variables.ric[i] / pfcoil_variables.n_pf_coil_turns[i]) * 1.0e6 / pfcoil_variables.rjconpf[i] * constants.dcopper @@ -1626,7 +1629,7 @@ def acc2222(self): costpfcu = ( cost_variables.uccu * (1.0e0 - pfcoil_variables.vf[i]) - * abs(pfcoil_variables.ric[i] / pfcoil_variables.turns[i]) + * abs(pfcoil_variables.ric[i] / pfcoil_variables.n_pf_coil_turns[i]) * 1.0e6 / pfcoil_variables.rjconpf[i] * constants.dcopper @@ -1646,7 +1649,7 @@ def acc2222(self): 1.0e-6 * constants.twopi * pfcoil_variables.r_pf_coil_middle[i] - * pfcoil_variables.turns[i] + * pfcoil_variables.n_pf_coil_turns[i] * cpfconpm ) @@ -1662,7 +1665,7 @@ def acc2222(self): * pfcoil_variables.awpoh * (1 - pfcoil_variables.vfohc) * (1 - pfcoil_variables.fcuohsu) - / pfcoil_variables.turns[pfcoil_variables.nohc - 1] + / pfcoil_variables.n_pf_coil_turns[pfcoil_variables.nohc - 1] * tfcoil_variables.dcond[ pfcoil_variables.i_cs_superconductor - 1 ] @@ -1691,7 +1694,7 @@ def acc2222(self): * pfcoil_variables.awpoh * (1 - pfcoil_variables.vfohc) * pfcoil_variables.fcuohsu - / pfcoil_variables.turns[pfcoil_variables.nohc - 1] + / pfcoil_variables.n_pf_coil_turns[pfcoil_variables.nohc - 1] * constants.dcopper ) else: @@ -1700,7 +1703,7 @@ def acc2222(self): cost_variables.uccu * pfcoil_variables.awpoh * (1 - pfcoil_variables.vfohc) - / pfcoil_variables.turns[pfcoil_variables.nohc - 1] + / pfcoil_variables.n_pf_coil_turns[pfcoil_variables.nohc - 1] * constants.dcopper ) @@ -1718,7 +1721,7 @@ def acc2222(self): 1.0e-6 * constants.twopi * pfcoil_variables.r_pf_coil_middle[pfcoil_variables.nohc - 1] - * pfcoil_variables.turns[pfcoil_variables.nohc - 1] + * pfcoil_variables.n_pf_coil_turns[pfcoil_variables.nohc - 1] * cpfconpm ) diff --git a/process/pfcoil.py b/process/pfcoil.py index 3de5ece109..9d08d7023e 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -430,7 +430,7 @@ def pfcoil(self): # them to (very) approximate values to avoid strange behaviour... if pf.first_call: pfv.sxlg[:, :] = 1.0e0 - pfv.turns[:] = 100.0e0 + pfv.n_pf_coil_turns[:] = 100.0e0 pf.first_call = False pfflux = 0.0e0 @@ -440,7 +440,7 @@ def pfcoil(self): pfflux = pfflux + ( pf.ccls[ccount] * pfv.sxlg[nocoil, pfv.ncirt - 1] - / pfv.turns[nocoil] + / pfv.n_pf_coil_turns[nocoil] ) nocoil = nocoil + 1 @@ -540,8 +540,8 @@ def pfcoil(self): # Number of turns # CPTDIN[i] is the current per turn (input) - pfv.turns[i] = abs((pfv.ric[i] * 1.0e6) / pfv.cptdin[i]) - aturn[i] = area / pfv.turns[i] + pfv.n_pf_coil_turns[i] = abs((pfv.ric[i] * 1.0e6) / pfv.cptdin[i]) + aturn[i] = area / pfv.n_pf_coil_turns[i] # Actual winding pack current density pfv.rjconpf[i] = 1.0e6 * abs(pfv.ric[i]) / area @@ -570,8 +570,8 @@ def pfcoil(self): * pfv.pf_current_safety_factor ) - pfv.turns[i] = abs((pfv.ric[i] * 1.0e6) / pfv.cptdin[i]) - aturn[i] = area / pfv.turns[i] + pfv.n_pf_coil_turns[i] = abs((pfv.ric[i] * 1.0e6) / pfv.cptdin[i]) + aturn[i] = area / pfv.n_pf_coil_turns[i] dx = 0.5e0 * math.sqrt(area) # square cross-section @@ -636,7 +636,12 @@ def pfcoil(self): # Length of conductor - rll = 2.0e0 * constants.pi * pfv.r_pf_coil_middle[i] * pfv.turns[i] + rll = ( + 2.0e0 + * constants.pi + * pfv.r_pf_coil_middle[i] + * pfv.n_pf_coil_turns[i] + ) # Resistive coils @@ -649,7 +654,7 @@ def pfcoil(self): pfv.powpfres = ( pfv.powpfres - + respf * (1.0e6 * pfv.curpfb[i] / pfv.turns[i]) ** 2 + + respf * (1.0e6 * pfv.curpfb[i] / pfv.n_pf_coil_turns[i]) ** 2 ) # Winding pack volume @@ -734,13 +739,13 @@ def pfcoil(self): for m in range(pfv.ngrp): for _n in range(pfv.ncls[m]): pfv.itr_sum = pfv.itr_sum + ( - pfv.r_pf_coil_middle[c] * pfv.turns[c] * pfv.cptdin[c] + pfv.r_pf_coil_middle[c] * pfv.n_pf_coil_turns[c] * pfv.cptdin[c] ) c = c + 1 pfv.itr_sum = pfv.itr_sum + ( (bv.dr_bore + 0.5 * bv.dr_cs) - * pfv.turns[pfv.nohc - 1] + * pfv.n_pf_coil_turns[pfv.nohc - 1] * pfv.cptdin[pfv.nohc - 1] ) @@ -767,7 +772,7 @@ def pfcoil(self): pfv.z_pf_coil_lower[pfv.nohc] = -pv.rminor * pv.kappa pfv.r_pf_coil_inner[pfv.nohc] = pv.rmajor - pv.rminor pfv.r_pf_coil_outer[pfv.nohc] = pv.rmajor + pv.rminor - pfv.turns[pfv.nohc] = 1.0e0 + pfv.n_pf_coil_turns[pfv.nohc] = 1.0e0 # Generate coil currents as a function of time using # user-provided waveforms etc. (cptdin, fcohbop, fcohbof) @@ -1033,12 +1038,12 @@ def ohcalc(self): pfv.ric[pfv.nohc - 1] = sgn * 1.0e-6 * pfv.coheof * pfv.areaoh # Number of turns - pfv.turns[pfv.nohc - 1] = ( + pfv.n_pf_coil_turns[pfv.nohc - 1] = ( 1.0e6 * abs(pfv.ric[pfv.nohc - 1]) / pfv.cptdin[pfv.nohc - 1] ) # Turn vertical cross-sectionnal area - pfv.a_oh_turn = pfv.areaoh / pfv.turns[pfv.nohc - 1] + pfv.a_oh_turn = pfv.areaoh / pfv.n_pf_coil_turns[pfv.nohc - 1] # Depth/width of cs turn conduit pfv.d_cond_cst = (pfv.a_oh_turn / pfv.ld_ratio_cst) ** 0.5 @@ -1746,7 +1751,7 @@ def induct(self, output): xohpl = xohpl + xc[ii] pfv.sxlg[pfv.ncirt - 1, pfv.nohc - 1] = ( - xohpl / (nplas * noh) * pfv.turns[pfv.nohc - 1] + xohpl / (nplas * noh) * pfv.n_pf_coil_turns[pfv.nohc - 1] ) pfv.sxlg[pfv.nohc - 1, pfv.ncirt - 1] = pfv.sxlg[ pfv.ncirt - 1, pfv.nohc - 1 @@ -1770,7 +1775,7 @@ def induct(self, output): for j in range(pfv.ncls[i]): ncoilj = ncoils + 1 - (j + 1) pfv.sxlg[ncoilj - 1, pfv.ncirt - 1] = ( - xpfpl / nplas * pfv.turns[ncoilj - 1] + xpfpl / nplas * pfv.n_pf_coil_turns[ncoilj - 1] ) pfv.sxlg[pfv.ncirt - 1, ncoilj - 1] = pfv.sxlg[ ncoilj - 1, pfv.ncirt - 1 @@ -1784,7 +1789,7 @@ def induct(self, output): pfv.r_pf_coil_outer[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1] ) # radial winding thickness pfv.sxlg[pfv.nohc - 1, pfv.nohc - 1] = self.selfinductance( - a, b, c, pfv.turns[pfv.nohc - 1] + a, b, c, pfv.n_pf_coil_turns[pfv.nohc - 1] ) # Central Solenoid / PF coil mutual inductances @@ -1805,7 +1810,10 @@ def induct(self, output): for j in range(pfv.ncls[i]): ncoilj = ncoils + 1 - (j + 1) pfv.sxlg[ncoilj - 1, pfv.nohc - 1] = ( - xohpf * pfv.turns[ncoilj - 1] * pfv.turns[pfv.nohc - 1] / noh + xohpf + * pfv.n_pf_coil_turns[ncoilj - 1] + * pfv.n_pf_coil_turns[pfv.nohc - 1] + / noh ) pfv.sxlg[pfv.nohc - 1, ncoilj - 1] = pfv.sxlg[ ncoilj - 1, pfv.nohc - 1 @@ -1829,19 +1837,23 @@ def induct(self, output): xc, br, bz, psi = bfield(rc, zc, cc, rp, zp) for k in range(pf.nef): if k < i: - pfv.sxlg[i, k] = xc[k] * pfv.turns[k] * pfv.turns[i] + pfv.sxlg[i, k] = ( + xc[k] * pfv.n_pf_coil_turns[k] * pfv.n_pf_coil_turns[i] + ) elif k == i: rl = abs( pfv.z_pf_coil_upper[k] - pfv.z_pf_coil_lower[k] ) / math.sqrt(constants.pi) pfv.sxlg[k, k] = ( constants.rmu0 - * pfv.turns[k] ** 2 + * pfv.n_pf_coil_turns[k] ** 2 * pfv.r_pf_coil_middle[k] * (math.log(8.0e0 * pfv.r_pf_coil_middle[k] / rl) - 1.75e0) ) else: - pfv.sxlg[i, k] = xc[k - 1] * pfv.turns[k] * pfv.turns[i] + pfv.sxlg[i, k] = ( + xc[k - 1] * pfv.n_pf_coil_turns[k] * pfv.n_pf_coil_turns[i] + ) # Output section if not output: @@ -2363,7 +2375,7 @@ def outpf(self): for k in range(pf.nef): op.write( self.outfile, - f"PF {k}\t\t\t{pfv.r_pf_coil_middle[k]:.2e}\t{pfv.z_pf_coil_middle[k]:.2e}\t{pfv.r_pf_coil_outer[k] - pfv.r_pf_coil_inner[k]:.2e}\t{abs(pfv.z_pf_coil_upper[k] - pfv.z_pf_coil_lower[k]):.2e}\t{pfv.turns[k]:.2e}", + f"PF {k}\t\t\t{pfv.r_pf_coil_middle[k]:.2e}\t{pfv.z_pf_coil_middle[k]:.2e}\t{pfv.r_pf_coil_outer[k] - pfv.r_pf_coil_inner[k]:.2e}\t{abs(pfv.z_pf_coil_upper[k] - pfv.z_pf_coil_lower[k]):.2e}\t{pfv.n_pf_coil_turns[k]:.2e}", ) for k in range(pf.nef): @@ -2394,8 +2406,8 @@ def outpf(self): op.ovarre( self.mfile, f"PF coil {k} turns", - f"(turns[{k}])", - pfv.turns[k], + f"(n_pf_coil_turns[{k}])", + pfv.n_pf_coil_turns[k], ) op.ovarre( self.mfile, @@ -2415,7 +2427,7 @@ def outpf(self): if bv.iohcl != 0: op.write( self.outfile, - f"CS\t\t\t\t{pfv.r_pf_coil_middle[pfv.nohc - 1]:.2e}\t{pfv.z_pf_coil_middle[pfv.nohc - 1]:.2e}\t{pfv.r_pf_coil_outer[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]:.2e}\t{abs(pfv.z_pf_coil_upper[pfv.nohc - 1] - pfv.z_pf_coil_lower[pfv.nohc - 1]):.2e}\t{pfv.turns[pfv.nohc - 1]:.2e}\t{pfv.pfcaseth[pfv.nohc - 1]:.2e}", + f"CS\t\t\t\t{pfv.r_pf_coil_middle[pfv.nohc - 1]:.2e}\t{pfv.z_pf_coil_middle[pfv.nohc - 1]:.2e}\t{pfv.r_pf_coil_outer[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]:.2e}\t{abs(pfv.z_pf_coil_upper[pfv.nohc - 1] - pfv.z_pf_coil_lower[pfv.nohc - 1]):.2e}\t{pfv.n_pf_coil_turns[pfv.nohc - 1]:.2e}\t{pfv.pfcaseth[pfv.nohc - 1]:.2e}", ) op.ovarre( self.mfile, @@ -2444,8 +2456,8 @@ def outpf(self): op.ovarre( self.mfile, "Central solenoid turns", - "(turns[nohc-1])", - pfv.turns[pfv.nohc - 1], + "(n_pf_coil_turns[nohc-1])", + pfv.n_pf_coil_turns[pfv.nohc - 1], ) op.ovarre( self.mfile, @@ -2600,7 +2612,7 @@ def outvolt(self): for k in range(pfv.ncirt - 1): line = f"\t{k}\t\t" for jj in range(6): - line += f"\t{pfv.c_pf_coil_turn[k, jj] * pfv.turns[k]:.3e}" + line += f"\t{pfv.c_pf_coil_turn[k, jj] * pfv.n_pf_coil_turns[k]:.3e}" op.write(self.outfile, line) line = "Plasma (A)\t\t" @@ -2615,12 +2627,12 @@ def outvolt(self): op.write( self.outfile, ( - f"{k}\t\t\t{pfv.c_pf_coil_turn[k, 0] * pfv.turns[k]:.3e}\t" - f"{pfv.c_pf_coil_turn[k, 1] * pfv.turns[k]:.3e}\t" - f"{-pfv.c_pf_coil_turn[k, 1] * pfv.turns[k] * (pfv.fcohbof / pfv.fcohbop):.3e}\t" - f"{-pfv.c_pf_coil_turn[k, 1] * pfv.turns[k] * (pfv.fcohbof / pfv.fcohbop):.3e}\t" - f"{-pfv.c_pf_coil_turn[k, 1] * pfv.turns[k] * (1.0e0 / pfv.fcohbop):.3e}\t" - f"{pfv.c_pf_coil_turn[k, 5] * pfv.turns[k]:.3e}" + f"{k}\t\t\t{pfv.c_pf_coil_turn[k, 0] * pfv.n_pf_coil_turns[k]:.3e}\t" + f"{pfv.c_pf_coil_turn[k, 1] * pfv.n_pf_coil_turns[k]:.3e}\t" + f"{-pfv.c_pf_coil_turn[k, 1] * pfv.n_pf_coil_turns[k] * (pfv.fcohbof / pfv.fcohbop):.3e}\t" + f"{-pfv.c_pf_coil_turn[k, 1] * pfv.n_pf_coil_turns[k] * (pfv.fcohbof / pfv.fcohbop):.3e}\t" + f"{-pfv.c_pf_coil_turn[k, 1] * pfv.n_pf_coil_turns[k] * (1.0e0 / pfv.fcohbop):.3e}\t" + f"{pfv.c_pf_coil_turn[k, 5] * pfv.n_pf_coil_turns[k]:.3e}" ), ) @@ -2631,9 +2643,9 @@ def outvolt(self): self.outfile, ( f"{k}\t\t\t{0.0:.3e}\t{0.0:.3e}\t" - f"{(pfv.c_pf_coil_turn[k, 2] + pfv.c_pf_coil_turn[k, 1] * pfv.fcohbof / pfv.fcohbop) * pfv.turns[k]:.3e}\t" - f"{(pfv.c_pf_coil_turn[k, 3] + pfv.c_pf_coil_turn[k, 1] * pfv.fcohbof / pfv.fcohbop) * pfv.turns[k]:.3e}\t" - f"{(pfv.c_pf_coil_turn[k, 4] + pfv.c_pf_coil_turn[k, 1] * 1.0e0 / pfv.fcohbop) * pfv.turns[k]:.3e}\t" + f"{(pfv.c_pf_coil_turn[k, 2] + pfv.c_pf_coil_turn[k, 1] * pfv.fcohbof / pfv.fcohbop) * pfv.n_pf_coil_turns[k]:.3e}\t" + f"{(pfv.c_pf_coil_turn[k, 3] + pfv.c_pf_coil_turn[k, 1] * pfv.fcohbof / pfv.fcohbop) * pfv.n_pf_coil_turns[k]:.3e}\t" + f"{(pfv.c_pf_coil_turn[k, 4] + pfv.c_pf_coil_turn[k, 1] * 1.0e0 / pfv.fcohbop) * pfv.n_pf_coil_turns[k]:.3e}\t" "0.0e0" ), ) @@ -2676,7 +2688,7 @@ def outvolt(self): self.outfile, circuit_name, circuit_var_name, - pfv.c_pf_coil_turn[k, jjj] * pfv.turns[k], + pfv.c_pf_coil_turn[k, jjj] * pfv.n_pf_coil_turns[k], ) def selfinductance(self, a, b, c, n): diff --git a/process/power.py b/process/power.py index ee25e6a709..5d175e8344 100644 --- a/process/power.py +++ b/process/power.py @@ -127,7 +127,7 @@ def pfpwr(self, output: bool): * pfcoil_variables.ric[ic] ) ) - * pfcoil_variables.turns[ic] ** 2 + * pfcoil_variables.n_pf_coil_turns[ic] ** 2 * pfcoil_variables.ncls[ig] ) @@ -224,14 +224,14 @@ def pfpwr(self, output: bool): # Resistive power in circuits at times times_variables.tim(3) and times_variables.tim(5) respectively (MW) powpfr = ( powpfr - + pfcoil_variables.turns[jpf] + + pfcoil_variables.n_pf_coil_turns[jpf] * pfcoil_variables.c_pf_coil_turn[jpf, 2] * cktr[jjpf] / 1.0e6 ) powpfr2 = ( powpfr2 - + pfcoil_variables.turns[jpf] + + pfcoil_variables.n_pf_coil_turns[jpf] * pfcoil_variables.c_pf_coil_turn[jpf, 4] * cktr[jjpf] / 1.0e6 diff --git a/process/pulse.py b/process/pulse.py index 8e335a2aa9..d8879997ae 100644 --- a/process/pulse.py +++ b/process/pulse.py @@ -103,7 +103,11 @@ def tohswg(self, output: bool) -> None: loh * (ioht2 - ioht1) / ( - ioht2 * (r * pfcoil_variables.turns[pfcoil_variables.nohc - 1] + rho) + ioht2 + * ( + r * pfcoil_variables.n_pf_coil_turns[pfcoil_variables.nohc - 1] + + rho + ) - v + m * ipdot ) diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index bcc11c386e..8a1cbca9d2 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -314,7 +314,7 @@ module pfcoil_variables real(dp) :: tmargoh !! Central solenoid temperature margin (K) - real(dp), dimension(ngc2) :: turns + real(dp), dimension(ngc2) :: n_pf_coil_turns !! number of turns in PF coil i real(dp), dimension(ngc2) :: vf @@ -494,7 +494,7 @@ subroutine init_pfcoil_variables sigpfcf = 1.0D0 sxlg = 0.0D0 tmargoh = 0.0D0 - turns = 0.0D0 + n_pf_coil_turns = 0.0D0 vf = 0.3D0 vfohc = 0.3D0 vsbn = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 84d1844631..687348dd69 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -819,49 +819,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6308E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6308E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8523E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 05ebb4498a..5e70df5e57 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -820,49 +820,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6308E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6308E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8523E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 0960ab383d..62bcb39df4 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -820,49 +820,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6308E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6308E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8523E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 5cf08faca5..9296089ade 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -820,49 +820,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3603E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2727E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4541E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.1248E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9262E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9262E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3049E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3049E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6308E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6308E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8523E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 8893625a76..7cc1cf4e59 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -823,49 +823,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3738E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2662E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2662E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4091E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4091E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7637E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.1628E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0608E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3575E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3575E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.0673E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.0673E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0269E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6276E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6738E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1326E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1326E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9242E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9242E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6968E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6370E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6738E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1326E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1326E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9242E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9242E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6968E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6370E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5216E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0591E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0591E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.2990E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.2990E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.1960E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5683E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5216E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0591E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0591E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.2990E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.2990E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.1960E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5683E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2588E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7696E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6221E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6221E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8489E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4055E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.4358E-04 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 3498e38b44..2e2ea5cf38 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -821,49 +821,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3191E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2937E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2937E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6029E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6029E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8411E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.5784E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0553E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3925E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3925E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.3326E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.3326E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1330E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.0768E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6710E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1276E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1276E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9072E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9072E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6289E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6218E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6710E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1276E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1276E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9072E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9072E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6289E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6218E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5185E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0862E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0862E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3077E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3077E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2309E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5692E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5185E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0862E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0862E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3077E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3077E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2309E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5692E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3263E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5540E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6787E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6787E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8715E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4070E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8645E-04 OP @@ -1984,49 +1984,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3025E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3022E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3022E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6633E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6633E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8653E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6865E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0536E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4030E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4030E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4133E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.4133E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1653E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1946E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6702E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1278E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1278E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9080E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9080E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6320E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6226E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6702E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1278E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1278E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9080E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9080E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6320E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6226E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5176E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1075E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1075E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3146E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3146E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2585E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5753E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5176E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1075E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1075E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3146E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3146E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2585E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5753E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3448E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5277E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6691E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6691E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8677E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4035E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9674E-04 OP @@ -3147,49 +3147,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.2890E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3092E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3092E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.7137E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.7137E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8855E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7779E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0523E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4117E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4117E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4806E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.4806E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1923E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2939E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6695E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1277E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1277E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9075E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9075E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6299E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6223E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6695E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1277E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1277E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9075E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9075E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6299E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6223E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5168E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1222E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1222E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3194E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3194E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2776E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5793E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5168E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1222E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1222E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3194E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3194E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2776E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5793E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3583E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5352E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6652E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6652E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8661E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4029E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0546E-04 OP @@ -4310,49 +4310,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.2904E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3091E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3091E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.7129E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.7129E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8852E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7987E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0524E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4119E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4119E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4823E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.4823E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1929E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.3157E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6695E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1276E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1276E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9072E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9072E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6289E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6217E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6695E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1276E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1276E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9072E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9072E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6289E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6217E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5169E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1200E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1200E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3187E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3187E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2748E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5786E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5169E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1200E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1200E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3187E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3187E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2748E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5786E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3569E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5349E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6617E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6617E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8647E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4028E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0446E-04 OP @@ -5473,49 +5473,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3025E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3027E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3027E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6670E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6670E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8668E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7021E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0536E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4038E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4038E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4193E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.4193E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1677E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2112E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6702E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1287E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1287E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9110E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9110E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6438E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6247E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6702E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1287E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1287E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9110E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9110E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6438E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6247E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5176E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1138E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1138E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3167E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3167E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2667E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5777E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5176E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1138E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1138E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3167E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3167E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2667E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5777E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3448E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5266E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6732E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6732E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8693E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4030E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9622E-04 OP @@ -6636,49 +6636,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3197E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2942E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2942E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6062E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6062E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8425E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.5872E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0554E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3932E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3932E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.3377E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.3377E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1351E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.0866E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6710E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1288E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1288E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9112E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9112E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6450E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6249E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6710E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1288E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1288E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9112E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9112E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6450E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6249E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5185E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0957E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0957E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3108E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3108E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2432E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5729E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5185E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0957E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0957E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3108E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3108E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2432E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5729E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3304E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4639E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6670E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6670E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8668E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4019E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8404E-04 OP @@ -7799,49 +7799,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3214E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2941E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2941E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6053E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6053E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8421E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6058E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0555E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3933E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3933E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.3389E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.3389E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1356E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1061E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6711E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1288E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1288E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9113E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9113E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6453E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6246E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6711E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1288E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1288E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9113E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9113E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6453E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6246E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5186E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0942E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0942E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3103E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3103E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2413E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5724E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5186E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0942E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0942E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3103E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3103E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2413E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5724E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3294E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4494E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6619E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6619E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8648E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4010E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8266E-04 OP @@ -8962,49 +8962,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3066E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3013E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3013E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6568E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6568E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8627E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7117E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0541E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4025E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4025E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4094E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.4094E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1638E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2208E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6704E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1281E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1281E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9089E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9089E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6357E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6226E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6704E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1281E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1281E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9089E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9089E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6357E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6226E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5178E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1059E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1059E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3141E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3141E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2565E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5749E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5178E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1059E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1059E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3141E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3141E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2565E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5749E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3439E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4622E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6621E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6621E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8648E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4004E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9210E-04 OP @@ -10125,49 +10125,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.2927E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3076E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3076E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.7019E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.7019E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8808E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.8179E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0527E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4108E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4108E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4731E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.4731E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1892E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.3356E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6696E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1265E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1265E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9035E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9035E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6140E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6179E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6696E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1265E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1265E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9035E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9035E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6140E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6179E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5170E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1109E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1109E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3157E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3157E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2629E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5747E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5170E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1109E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1109E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3157E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3157E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2629E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5747E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3578E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4724E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6615E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6615E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8646E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.3999E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0077E-04 OP @@ -11288,49 +11288,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.2934E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3081E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3081E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.7053E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.7053E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8821E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.8302E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0527E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4114E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4114E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4783E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.4783E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1913E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.3487E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6697E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1274E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1274E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9066E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9066E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6263E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6202E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6697E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1274E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1274E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9066E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9066E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6263E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6202E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5171E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1164E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1164E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3175E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3175E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2700E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5770E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5171E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1164E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1164E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3175E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3175E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2700E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5770E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3570E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4720E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6601E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6601E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8640E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.3998E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0009E-04 OP @@ -12451,49 +12451,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3075E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3023E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3023E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6640E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6640E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8656E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7247E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0541E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4037E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4037E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4184E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.4184E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1674E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2346E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6704E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1294E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1294E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9134E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9134E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6535E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6262E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6704E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1294E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1294E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9134E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9134E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6535E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6262E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5179E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1140E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1140E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3167E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3167E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2670E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5783E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5179E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1140E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1140E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3167E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3167E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2670E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5783E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3426E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4697E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6609E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6609E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8643E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4002E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9208E-04 OP @@ -13614,49 +13614,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3220E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2960E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2960E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6187E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6187E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8475E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6307E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0556E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3956E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3956E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.3561E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.3561E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1424E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1325E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6712E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1302E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1302E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9159E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9159E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6635E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6284E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6712E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1302E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1302E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9159E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9159E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6635E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6284E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5187E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1029E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1029E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3131E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3131E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2525E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5762E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5187E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1029E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1029E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3131E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3131E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2525E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5762E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3286E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4537E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6527E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6527E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8611E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.3997E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8389E-04 OP @@ -14777,49 +14777,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3230E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2964E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2964E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6216E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6216E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8486E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6451E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0557E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3962E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3962E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.3608E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.3608E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1443E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1478E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6712E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1309E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1309E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9184E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9184E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6735E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6303E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6712E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1309E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1309E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9184E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9184E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6735E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6303E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5187E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1069E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1069E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3145E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3145E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2578E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5780E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5187E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1069E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1069E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3145E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3145E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2578E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5780E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3276E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4535E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6506E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6506E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8602E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.3996E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8318E-04 OP @@ -15940,49 +15940,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3081E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3038E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3038E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.6745E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6745E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8698E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7386E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0542E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4053E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4053E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.4312E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.4312E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1725E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2496E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6704E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1310E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1310E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9188E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9188E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6753E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6307E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6704E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1310E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1310E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9188E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9188E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6753E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6307E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5179E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1247E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1247E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3202E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3202E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2808E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5828E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5179E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1247E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1247E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3202E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3202E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2808E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5828E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3422E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4673E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6556E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6556E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8622E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.3991E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9246E-04 OP @@ -17103,49 +17103,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.2932E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.3112E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3112E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.7279E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.7279E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8912E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.8313E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0527E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4145E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4145E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.5024E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.5024E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.2010E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.3506E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6697E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1312E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1312E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9193E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9193E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6773E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6312E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6697E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1312E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1312E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9193E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9193E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6773E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6312E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5170E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1430E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1430E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.3262E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3262E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.3046E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5879E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5170E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1430E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1430E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.3262E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3262E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.3046E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5879E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3568E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4798E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6592E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6592E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8637E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.3987E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0197E-04 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 21a604c6e4..50714f61ca 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -656,49 +656,49 @@ PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 - PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 + PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 - PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 + PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 - PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 + PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 - PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 + PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 - PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 + PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 - PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 + PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP @@ -1651,49 +1651,49 @@ PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 - PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 + PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 - PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 + PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 - PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 + PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 - PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 + PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 - PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 + PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 - PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 + PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP @@ -2646,49 +2646,49 @@ PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 - PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 + PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 - PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 + PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 - PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 + PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 - PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 + PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 - PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 + PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 - PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 + PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP @@ -3641,49 +3641,49 @@ PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 - PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 + PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 - PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 + PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 - PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 + PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 - PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 + PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 - PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 + PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 - PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 + PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP @@ -4636,49 +4636,49 @@ PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 - PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 + PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 - PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 + PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 - PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 + PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 - PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 + PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 - PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 + PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 - PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 + PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP @@ -5631,49 +5631,49 @@ PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 - PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 + PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 - PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 + PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 - PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 + PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 - PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 + PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 - PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 + PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 - PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 + PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP @@ -6626,49 +6626,49 @@ PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 - PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 + PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 - PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 + PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 - PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 + PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 - PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 + PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 - PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 + PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 - PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 + PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP @@ -7621,49 +7621,49 @@ PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 - PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 + PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 - PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 + PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 - PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 + PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 - PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 + PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 - PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 + PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 - PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 + PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP @@ -8616,49 +8616,49 @@ PF_coil_01_vertical_position_(m)________________________________________ (z_pf_coil_middle(01))_____________________ 9.9877E+00 PF_coil_01_radial_thickness_(m)_________________________________________ (pfdr01)______________________ 1.1966E+00 PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 - PF_coil_01_turns________________________________________________________ (turns(01))___________________ 3.7322E+02 + PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 - PF_coil_02_turns________________________________________________________ (turns(02))___________________ 4.3026E+02 + PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 - PF_coil_03_turns________________________________________________________ (turns(03))___________________ 1.9327E+02 + PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 - PF_coil_04_turns________________________________________________________ (turns(04))___________________ 1.9327E+02 + PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 - PF_coil_05_turns________________________________________________________ (turns(05))___________________ 1.2530E+02 + PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 - PF_coil_06_turns________________________________________________________ (turns(06))___________________ 1.2530E+02 + PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (turns(nohc))_________________ 3.5015E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 13bf55645b..213710012c 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7647,7 +7647,7 @@ "turbine_hall_h": 15.0, "turbine_hall_l": 109.0, "turbine_hall_w": 62.0, - "turns": 0.0, + "n_pf_coil_turns": 0.0, "tw_storage_h": 5.0, "tw_storage_l": 90.0, "tw_storage_w": 30.0, @@ -10878,7 +10878,7 @@ "turbine_hall_h": "turbine hall length, width, height (m)", "turbine_hall_l": "turbine hall length, width, height (m)", "turbine_hall_w": "turbine hall length, width, height (m)", - "turns": "number of turns in PF coil i", + "n_pf_coil_turns": "number of turns in PF coil i", "tw_storage_h": "tritiated waste storage building length, width, height (m)", "tw_storage_l": "tritiated waste storage building length, width, height (m)", "tw_storage_w": "tritiated waste storage building length, width, height (m)", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index f3d57eaab7..10927e2652 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -823,49 +823,49 @@ PF_coil_0_vertical_position_(m)_________________________________________ (z_pf_coil_middle[0])______________________ 9.3738E+00 PF_coil_0_radial_thickness_(m)__________________________________________ (pfdr(0))_____________________ 1.2662E+00 PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2662E+00 - PF_coil_0_turns_________________________________________________________ (turns[0])____________________ 4.4091E+02 + PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4091E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7637E+01 PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.1628E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0608E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3575E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3575E+00 - PF_coil_1_turns_________________________________________________________ (turns[1])____________________ 5.0673E+02 + PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.0673E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0269E+01 PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6276E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6738E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1326E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1326E+00 - PF_coil_2_turns_________________________________________________________ (turns[2])____________________ 1.9242E+02 + PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9242E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6968E+00 PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6370E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6738E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1326E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1326E+00 - PF_coil_3_turns_________________________________________________________ (turns[3])____________________ 1.9242E+02 + PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9242E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6968E+00 PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6370E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5216E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0591E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0591E-01 - PF_coil_4_turns_________________________________________________________ (turns[4])____________________ 1.2990E+02 + PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.2990E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.1960E+00 PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5683E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5216E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0591E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0591E-01 - PF_coil_5_turns_________________________________________________________ (turns[5])____________________ 1.2990E+02 + PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.2990E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.1960E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5683E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2588E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7696E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (turns[nohc-1])_______________ 4.6221E+03 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6221E+03 Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8489E+02 Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4055E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.4358E-04 OP diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index edce4ab75f..4e39749493 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -2032,7 +2032,7 @@ class Acc2222Param(NamedTuple): nohc: Any = None - turns: Any = None + n_pf_coil_turns: Any = None i_pf_superconductor: Any = None @@ -2132,7 +2132,7 @@ class Acc2222Param(NamedTuple): i_pf_conductor=0, vfohc=0.29999999999999999, nohc=7, - turns=np.array( + n_pf_coil_turns=np.array( np.array( ( 349.33800535811901, @@ -2328,7 +2328,7 @@ class Acc2222Param(NamedTuple): i_pf_conductor=0, vfohc=0.29999999999999999, nohc=7, - turns=np.array( + n_pf_coil_turns=np.array( np.array( ( 440.26292595093469, @@ -2524,7 +2524,7 @@ class Acc2222Param(NamedTuple): i_pf_conductor=0, vfohc=0.29999999999999999, nohc=7, - turns=np.array( + n_pf_coil_turns=np.array( np.array( ( 440.26292595093469, @@ -2721,7 +2721,9 @@ def test_acc2222(acc2222param, monkeypatch, costs): monkeypatch.setattr(pfcoil_variables, "nohc", acc2222param.nohc) - monkeypatch.setattr(pfcoil_variables, "turns", acc2222param.turns) + monkeypatch.setattr( + pfcoil_variables, "n_pf_coil_turns", acc2222param.n_pf_coil_turns + ) monkeypatch.setattr( pfcoil_variables, "i_pf_superconductor", acc2222param.i_pf_superconductor diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 41a056172b..604a2cbac9 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -213,7 +213,7 @@ class PfpwrParam(NamedTuple): sxlg: Any = None - turns: Any = None + n_pf_coil_turns: Any = None vf: Any = None @@ -738,7 +738,7 @@ class PfpwrParam(NamedTuple): ), order="F", ).transpose(), - turns=np.array( + n_pf_coil_turns=np.array( np.array( ( 349.33800535811901, @@ -1481,7 +1481,7 @@ class PfpwrParam(NamedTuple): ), order="F", ).transpose(), - turns=np.array( + n_pf_coil_turns=np.array( np.array( ( 440.26292595093463, @@ -1818,7 +1818,7 @@ def test_pfpwr(pfpwrparam, monkeypatch, power): monkeypatch.setattr(pfcoil_variables, "sxlg", pfpwrparam.sxlg) - monkeypatch.setattr(pfcoil_variables, "turns", pfpwrparam.turns) + monkeypatch.setattr(pfcoil_variables, "n_pf_coil_turns", pfpwrparam.n_pf_coil_turns) monkeypatch.setattr(pfcoil_variables, "vf", pfpwrparam.vf) diff --git a/tests/unit/test_pulse.py b/tests/unit/test_pulse.py index 923b4b8655..e05ec030d5 100644 --- a/tests/unit/test_pulse.py +++ b/tests/unit/test_pulse.py @@ -44,7 +44,7 @@ class TohswgParam(NamedTuple): ric: Any = None - turns: Any = None + n_pf_coil_turns: Any = None cptdin: Any = None @@ -493,7 +493,7 @@ class BurnParam(NamedTuple): ), order="F", ).transpose(), - turns=np.array( + n_pf_coil_turns=np.array( np.array( ( 349.33800535811781, @@ -1051,7 +1051,7 @@ class BurnParam(NamedTuple): ), order="F", ).transpose(), - turns=np.array( + n_pf_coil_turns=np.array( np.array( ( 440.41576282070616, @@ -1247,7 +1247,9 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): monkeypatch.setattr(pfcoil_variables, "ric", tohswgparam.ric) - monkeypatch.setattr(pfcoil_variables, "turns", tohswgparam.turns) + monkeypatch.setattr( + pfcoil_variables, "n_pf_coil_turns", tohswgparam.n_pf_coil_turns + ) monkeypatch.setattr(pfcoil_variables, "cptdin", tohswgparam.cptdin) From c565caef47683603e29fe42e0cc583c78939a117 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 14:36:42 +0000 Subject: [PATCH 19/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'tmargoh'=20to=20?= =?UTF-8?q?'temp=5Fcs=5Fmargin'=20across=20multiple=20files=20for=20consis?= =?UTF-8?q?tency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/io/plot_proc.py | 2 +- process/pfcoil.py | 8 ++--- source/fortran/constraint_equations.f90 | 8 ++--- source/fortran/pfcoil_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/integration/test_pfcoil_int.py | 2 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- 21 files changed, 60 insertions(+), 60 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index dc2d53f962..5c944cb63a 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -803,7 +803,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5000E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5000E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index b90fb16dc3..f2d2cb058a 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -798,7 +798,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5052E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5052E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 75ec53d94b..38c3c646d7 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -798,7 +798,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5052E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5052E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 73ccb0deda..5e7a59f146 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -798,7 +798,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5052E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5052E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 8ca12d1ac8..fb26ff3ceb 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -798,7 +798,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5052E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5052E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 98787ab26f..6b153d4b7d 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -646,7 +646,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 @@ -1641,7 +1641,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 @@ -2636,7 +2636,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 @@ -3631,7 +3631,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 @@ -4626,7 +4626,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 @@ -5621,7 +5621,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 @@ -6616,7 +6616,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 @@ -7611,7 +7611,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 @@ -8606,7 +8606,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 789dda862d..df1015fbc7 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2645,7 +2645,7 @@ def plot_magnetics_info(axis, mfile_data, scan): ("bmaxtfrp", "Peak field at conductor (w. rip.)", "T"), ("iooic", r"I/I$_{\mathrm{crit}}$", ""), ("tmargtf", "TF Temperature margin", "K"), - ("tmargoh", "CS Temperature margin", "K"), + ("temp_cs_margin", "CS Temperature margin", "K"), (sig_cond, "TF Cond max TRESCA stress", "MPa"), (sig_case, "TF Case max TRESCA stress", "MPa"), ("whttf/n_tf_coils", "Mass per TF coil", "kg"), diff --git a/process/pfcoil.py b/process/pfcoil.py index 9d08d7023e..1cc65db41f 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1247,7 +1247,7 @@ def ohcalc(self): pfv.rjpfalw[pfv.nohc - 1] = jcritwp * pfv.awpoh / pfv.areaoh pfv.rjohc0 = pfv.rjpfalw[pfv.nohc - 1] - pfv.tmargoh = min(tmarg1, tmarg2) + pfv.temp_cs_margin = min(tmarg1, tmarg2) else: # Resistive power losses (non-superconducting coil) @@ -2150,8 +2150,8 @@ def outpf(self): op.ovarre( self.outfile, "CS temperature margin (K)", - "(tmargoh)", - pfv.tmargoh, + "(temp_cs_margin)", + pfv.temp_cs_margin, "OP ", ) op.ovarre( @@ -2243,7 +2243,7 @@ def outpf(self): abs(pfv.coheof) > 0.99e0 * abs(numerics.boundu[37] * pfv.rjohc) ) or (abs(pfv.cohbop) > 0.99e0 * abs(numerics.boundu[38] * pfv.rjohc0)): pf.cslimit = True - if pfv.tmargoh < 1.01e0 * tfv.tmargmin_cs: + if pfv.temp_cs_margin < 1.01e0 * tfv.tmargmin_cs: pf.cslimit = True if not pf.cslimit: eh.report_error(135) diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 5cf3816860..03658d671d 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2395,10 +2395,10 @@ subroutine constraint_eqn_060(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! ftmargoh : input real : f-value for central solenoid temperature margin - !! tmargoh : input real : Central solenoid temperature margin (K) + !! temp_cs_margin : input real : Central solenoid temperature margin (K) !! tmargmin_cs : input real : Minimum allowable temperature margin : CS (K) use constraint_variables, only: ftmargoh - use pfcoil_variables, only: tmargoh + use pfcoil_variables, only: temp_cs_margin use tfcoil_variables, only: tmargmin_cs implicit none real(dp), intent(out) :: tmp_cc @@ -2407,9 +2407,9 @@ subroutine constraint_eqn_060(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 - ftmargoh * tmargoh/tmargmin_cs + tmp_cc = 1.0D0 - ftmargoh * temp_cs_margin/tmargmin_cs tmp_con = tmargmin_cs - tmp_err = tmargmin_cs - tmargoh + tmp_err = tmargmin_cs - temp_cs_margin tmp_symbol = '>' tmp_units = 'K' diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 8a1cbca9d2..40ab7bda6a 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -311,7 +311,7 @@ module pfcoil_variables real(dp), dimension(ngc2,ngc2) :: sxlg !! mutual inductance matrix (H) - real(dp) :: tmargoh + real(dp) :: temp_cs_margin !! Central solenoid temperature margin (K) real(dp), dimension(ngc2) :: n_pf_coil_turns @@ -493,7 +493,7 @@ subroutine init_pfcoil_variables sigpfcalw = 500.0D0 sigpfcf = 1.0D0 sxlg = 0.0D0 - tmargoh = 0.0D0 + temp_cs_margin = 0.0D0 n_pf_coil_turns = 0.0D0 vf = 0.3D0 vfohc = 0.3D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 687348dd69..8510d1dd96 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -797,7 +797,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5052E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5052E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 5e70df5e57..dded449775 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -798,7 +798,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5052E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5052E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 62bcb39df4..d97bb07433 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -798,7 +798,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5052E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5052E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 9296089ade..05b7bbdaa6 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -798,7 +798,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5052E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5052E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 7cc1cf4e59..f6381d3517 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -801,7 +801,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5029E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5029E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 2e2ea5cf38..7c1d6ad2b0 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -799,7 +799,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5002E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5002E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 @@ -1962,7 +1962,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5045E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5045E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 @@ -3125,7 +3125,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5074E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5074E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 @@ -4288,7 +4288,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5086E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5086E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 @@ -5451,7 +5451,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5092E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5092E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 @@ -6614,7 +6614,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5008E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5008E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 @@ -7777,7 +7777,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5019E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5019E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 @@ -8940,7 +8940,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5057E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5057E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 @@ -10103,7 +10103,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5072E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5072E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 @@ -11266,7 +11266,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5076E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5076E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 @@ -12429,7 +12429,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5092E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5092E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 @@ -13592,7 +13592,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5115E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5115E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 @@ -14755,7 +14755,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5123E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5123E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 @@ -15918,7 +15918,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5149E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5149E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 @@ -17081,7 +17081,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5162E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5162E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 50714f61ca..c838447503 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -646,7 +646,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 @@ -1641,7 +1641,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 @@ -2636,7 +2636,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 @@ -3631,7 +3631,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 @@ -4626,7 +4626,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 @@ -5621,7 +5621,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 @@ -6616,7 +6616,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 @@ -7611,7 +7611,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 @@ -8606,7 +8606,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 4.1259E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 PF_coil_superconductor_material_________________________________________ (i_pf_superconductor)____________________ 3 Copper_fraction_in_conductor____________________________________________ (fcupfsu)_____________________ 6.9000E-01 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 213710012c..d0388dd23b 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7609,7 +7609,7 @@ "tmargmin": 0.0, "tmargmin_cs": 0.0, "tmargmin_tf": 0.0, - "tmargoh": 0.0, + "temp_cs_margin": 0.0, "tmargtf": 0.0, "tmax_croco": 200.0, "tmaxpro": 150.0, @@ -10840,7 +10840,7 @@ "tmargmin": "minimum allowable temperature margin : TFC AND CS (K)", "tmargmin_cs": "minimum allowable temperature margin : CS (K)", "tmargmin_tf": "minimum allowable temperature margin : TF coils (K)", - "tmargoh": "Central solenoid temperature margin (K)", + "temp_cs_margin": "Central solenoid temperature margin (K)", "tmargtf": "TF coil temperature margin (K)", "tmax_croco": "CroCo strand: maximum permitted temp during a quench (K)", "tmaxpro": "maximum temp rise during a quench for protection (K)", @@ -18990,7 +18990,7 @@ "sigpfcalw", "sigpfcf", "sxlg", - "tmargoh", + "temp_cs_margin", "turns", "vf", "vfohc", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 67561f0f3b..b16fb7ab33 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -209,7 +209,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "oh_steel_frac", 5.926e-1) monkeypatch.setattr(pfv, "bmaxoh0", 1.4e1) monkeypatch.setattr(pfv, "rjohc", 4.070e7) - monkeypatch.setattr(pfv, "tmargoh", 1.5) + monkeypatch.setattr(pfv, "temp_cs_margin", 1.5) monkeypatch.setattr(pfv, "i_pf_conductor", 0) monkeypatch.setattr(pfv, "rjpfalw", np.full(22, 0.0)) monkeypatch.setattr(pfv, "pfclres", 2.8e-8) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 48193718e9..2817ec4373 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -3412,7 +3412,7 @@ iavail = 0 *icc = 61 * DESCRIPTION: Constraint equation for availability limit * JUSTIFICATION: Turned off, do not care about availability limit -* VARIABLES: tmargmin_cs (Minimum allowable temperature margin in CS (K)), tmargoh calculated in-situ +* VARIABLES: tmargmin_cs (Minimum allowable temperature margin in CS (K)), temp_cs_margin calculated in-situ *avail_min = * DESCRIPTION: Minimum availability (`constraint equation 61`) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 10927e2652..ca242a9e5d 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -801,7 +801,7 @@ Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 - CS_temperature_margin_(K)_______________________________________________ (tmargoh)_____________________ 1.5029E+00 OP + CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5029E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 Residual_hoop_stress_in_CS_Steel_(Pa)___________________________________ (residual_sig_hoop)___________ 2.4000E+08 Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 From acb9f275998837f655752ef4c9eecc018a2a56d0 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 14:39:16 +0000 Subject: [PATCH 20/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'pfclres'=20to=20?= =?UTF-8?q?'rho=5Fpf=5Fcoil'=20across=20multiple=20files=20for=20consisten?= =?UTF-8?q?cy=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- documentation/proc-pages/eng-models/pf-coil.md | 2 +- process/init.py | 2 +- process/pfcoil.py | 4 ++-- process/power.py | 2 +- source/fortran/input.f90 | 6 +++--- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 10 +++++----- tests/integration/test_pfcoil_int.py | 4 ++-- tests/regression/input_files/st_regression.IN.DAT | 2 +- tests/unit/test_power.py | 8 ++++---- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/documentation/proc-pages/eng-models/pf-coil.md b/documentation/proc-pages/eng-models/pf-coil.md index 17f9c6c7da..e4c15942e6 100644 --- a/documentation/proc-pages/eng-models/pf-coil.md +++ b/documentation/proc-pages/eng-models/pf-coil.md @@ -59,7 +59,7 @@ ramp-up period, although it will pass through zero during the burn phase. Date: Tue, 11 Feb 2025 14:46:19 +0000 Subject: [PATCH 21/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'ngrp'=20to=20'n?= =?UTF-8?q?=5Fpf=5Fcoil=5Fgroups'=20for=20consistency=20and=20clarity=20ac?= =?UTF-8?q?ross=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/pf-coil.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/large_tokamak_IN.DAT | 2 +- examples/data/scan_MFILE.DAT | 2 +- examples/data/scan_example_file_IN.DAT | 2 +- process/init.py | 2 +- process/pfcoil.py | 87 ++++++++++--------- process/power.py | 2 +- process/utilities/errorlist.json | 2 +- source/fortran/input.f90 | 6 +- source/fortran/pfcoil_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- .../data/large_tokamak_once_through.IN.DAT | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 2 +- tests/integration/data/scan_MFILE.DAT | 2 +- .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 8 +- tests/integration/test_pfcoil_int.py | 20 ++--- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_pfcoil.py | 4 +- tests/unit/test_power.py | 10 ++- 37 files changed, 102 insertions(+), 97 deletions(-) diff --git a/documentation/proc-pages/eng-models/pf-coil.md b/documentation/proc-pages/eng-models/pf-coil.md index e4c15942e6..cedc103af5 100644 --- a/documentation/proc-pages/eng-models/pf-coil.md +++ b/documentation/proc-pages/eng-models/pf-coil.md @@ -12,7 +12,7 @@ of the required currents and allowable current density. The PF coil locations are controlled using a set of switched stored in array `i_pf_location` (see Figure 1), and are calculated in routine `PFCOIL`. The coils are (usually) organised into groups containing two PF coils placed symmetrically above and below the midplane, and each group `j` has -an element `i_pf_location(j)` assigned to it. Input parameter `ngrp` should be set to the number of groups, +an element `i_pf_location(j)` assigned to it. Input parameter `n_pf_coil_groups` should be set to the number of groups, and `ncls(j)` should be assigned the number of coils in each group - which should be 2 in each case.
      diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 5c944cb63a..542aafc4a7 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -1746,7 +1746,7 @@ i_pf_superconductor = 3 ncls = 1,1,2,2 * Number of groups of PF coils -ngrp = 4 +n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height ohhghf = 0.9 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index f2d2cb058a..da427e92ff 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -1740,7 +1740,7 @@ i_pf_superconductor = 3 ncls = 1,1,2,2 * Number of groups of PF coils -ngrp = 4 +n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height ohhghf = 0.9 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 38c3c646d7..0ab4cca97f 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -1740,7 +1740,7 @@ i_pf_superconductor = 3 ncls = 1,1,2,2 * Number of groups of PF coils -ngrp = 4 +n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height ohhghf = 0.9 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 5e7a59f146..91006cc598 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -1741,7 +1741,7 @@ i_pf_superconductor = 3 ncls = 1,1,2,2 * Number of groups of PF coils -ngrp = 4 +n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height ohhghf = 0.9 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index fb26ff3ceb..8615e571d4 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -1741,7 +1741,7 @@ i_pf_superconductor = 3 ncls = 1,1,2,2 * Number of groups of PF coils -ngrp = 4 +n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height ohhghf = 0.9 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index b44197d607..a69f1979c5 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -551,7 +551,7 @@ i_pf_superconductor = 3 ncls = 1,1,2,2 * Number of groups of PF coils -ngrp = 4 +n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height ohhghf = 0.9 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 6b153d4b7d..0e04760013 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -9208,7 +9208,7 @@ fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; ncls = 1,1,2,2, * Number of pf coils in group j -ngrp = 4 * Number of groups of pf coils; +n_pf_coil_groups = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 7d6d6f465a..a40b5aa98f 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -551,7 +551,7 @@ i_pf_superconductor = 3 ncls = 1,1,2,2 * Number of groups of PF coils -ngrp = 4 +n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height ohhghf = 0.9 diff --git a/process/init.py b/process/init.py index 79bccaa0ff..445fae7186 100644 --- a/process/init.py +++ b/process/init.py @@ -821,7 +821,7 @@ def check_process(): # Check PF coil configurations j = 0 k = 0 - for i in range(fortran.pfcoil_variables.ngrp): + for i in range(fortran.pfcoil_variables.n_pf_coil_groups): if ( fortran.pfcoil_variables.i_pf_location[i] != 2 and fortran.pfcoil_variables.ncls[i] != 2 diff --git a/process/pfcoil.py b/process/pfcoil.py index c052fb2dfe..f6c632a8bf 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -88,15 +88,15 @@ def pfcoil(self): # Set up the number of PF coils including the Central Solenoid (nohc), # and the number of PF circuits including the plasma (ncirt) - if pfv.ngrp > pfv.n_pf_groups_max: - eh.idiags[0] = pfv.ngrp + if pfv.n_pf_coil_groups > pfv.n_pf_groups_max: + eh.idiags[0] = pfv.n_pf_coil_groups eh.idiags[1] = pfv.n_pf_groups_max eh.report_error(64) # Total the number of PF coils in all groups, and check that none # exceeds the limit pfv.nohc = 0 - for i in range(pfv.ngrp): + for i in range(pfv.n_pf_coil_groups): if pfv.ncls[i] > pfv.nclsmx: eh.idiags[0] = i eh.idiags[1] = pfv.ncls[i] @@ -108,7 +108,7 @@ def pfcoil(self): # Add one if an Central Solenoid is present, and make an extra group if bv.iohcl != 0: pfv.nohc = pfv.nohc + 1 - pfv.ncls[pfv.ngrp] = 1 + pfv.ncls[pfv.n_pf_coil_groups] = 1 # Add one for the plasma pfv.ncirt = pfv.nohc + 1 @@ -164,7 +164,7 @@ def pfcoil(self): # Place the PF coils: # N.B. Problems here if k=ncls(group) is greater than 2. - for j in range(pfv.ngrp): + for j in range(pfv.n_pf_coil_groups): if pfv.i_pf_location[j] == 1: # PF coil is stacked on top of the Central Solenoid for k in range(pfv.ncls[j]): @@ -266,7 +266,7 @@ def pfcoil(self): pf.rfxf, pf.zfxf, pf.cfxf, - pfv.ngrp, + pfv.n_pf_coil_groups, pfv.ncls, pf.rcls, pf.zcls, @@ -281,7 +281,7 @@ def pfcoil(self): # Simple coil current scaling for STs (good only for A < about 1.8) # Bypasses SVD solver if pv.itart == 1 and pv.itartpf == 0: - for i in range(pfv.ngrp): + for i in range(pfv.n_pf_coil_groups): if pfv.i_pf_location[i] == 1: # PF coil is stacked on top of the Central Solenoid pf.ccls[i] = 0.0e0 @@ -319,7 +319,7 @@ def pfcoil(self): nfxf0 = 0 ngrp0 = 0 nocoil = 0 - for i in range(pfv.ngrp): + for i in range(pfv.n_pf_coil_groups): if pfv.i_pf_location[i] == 1: # Do not allow if no central solenoid if bv.iohcl == 0: @@ -435,7 +435,7 @@ def pfcoil(self): pfflux = 0.0e0 nocoil = 0 - for ccount in range(pfv.ngrp): + for ccount in range(pfv.n_pf_coil_groups): for _i in range(pfv.ncls[ccount]): pfflux = pfflux + ( pf.ccls[ccount] @@ -478,7 +478,7 @@ def pfcoil(self): # Split groups of coils into one set containing ncl coils ncl = 0 - for nng in range(pfv.ngrp): + for nng in range(pfv.n_pf_coil_groups): for ng2 in range(pfv.ncls[nng]): pfv.r_pf_coil_middle[ncl] = pf.rcls[nng, ng2] pfv.z_pf_coil_middle[ncl] = pf.zcls[nng, ng2] @@ -528,7 +528,7 @@ def pfcoil(self): dz = 0 - for ii in range(pfv.ngrp): + for ii in range(pfv.n_pf_coil_groups): for _ij in range(pfv.ncls[ii]): if pfv.i_pf_location[ii] == 1: # PF coil is stacked on top of the Central Solenoid @@ -598,7 +598,7 @@ def pfcoil(self): pfv.powpfres = 0.0e0 pfv.pfmmax = 0.0e0 - for ii in range(pfv.ngrp): + for ii in range(pfv.n_pf_coil_groups): iii = ii for ij in range(pfv.ncls[ii]): # Peak field @@ -736,7 +736,7 @@ def pfcoil(self): # Find sum of current x turns x radius for all coils for 2015 costs model c = 0 pfv.itr_sum = 0.0e0 - for m in range(pfv.ngrp): + for m in range(pfv.n_pf_coil_groups): for _n in range(pfv.ncls[m]): pfv.itr_sum = pfv.itr_sum + ( pfv.r_pf_coil_middle[c] * pfv.n_pf_coil_turns[c] * pfv.cptdin[c] @@ -801,7 +801,7 @@ def efc( rfix, zfix, cfix, - ngrp, + n_pf_coil_groups, ncls, rcls, zcls, @@ -840,9 +840,9 @@ def efc( :type zfix: np.ndarray :param cfix: Fixed currents (A) :type cfix: np.ndarray - :param ngrp: number of coil groups, where all coils in a group have the + :param n_pf_coil_groups: number of coil groups, where all coils in a group have the same current, <= n_pf_groups_max - :type ngrp: int + :type n_pf_coil_groups: int :param ncls: number of coils in each group, each value <= nclsmx :type ncls: np.ndarray :param rcls: coords R(i,j), Z(i,j) of coil j in group i (m) @@ -891,7 +891,7 @@ def efc( zpts, brin, bzin, - int(ngrp), + int(n_pf_coil_groups), ncls, rcls, zcls, @@ -902,12 +902,12 @@ def efc( # Solve matrix equation ccls = self.solv( - pfv.n_pf_groups_max, ngrp, nrws, gmat, bvec + pfv.n_pf_groups_max, n_pf_coil_groups, nrws, gmat, bvec ) # Calculate the norm of the residual vectors brssq, brnrm, bzssq, bznrm, ssq = rsid( - npts, brin, bzin, nfix, int(ngrp), ccls, bfix, gmat + npts, brin, bzin, nfix, int(n_pf_coil_groups), ccls, bfix, gmat ) return ssq, ccls @@ -920,8 +920,8 @@ def tf_pf_collision_detector(self): if tfv.i_tf_shape == 2: pf_tf_collision = 0 - for i in range(pfv.ngrp): - for ii in range(pfv.ngrp): + for i in range(pfv.n_pf_coil_groups): + for ii in range(pfv.n_pf_coil_groups): for ij in range(pfv.ncls[ii]): if pf.rcls[ii, ij] <= ( # Outboard TF coil collision pf.rclsnorm - pfv.routr + pfv.r_pf_coil_middle[i] @@ -958,7 +958,7 @@ def tf_pf_collision_detector(self): if pf_tf_collision >= 1: eh.report_error(277) - def solv(self, n_pf_groups_max, ngrp, nrws, gmat, bvec): + def solv(self, n_pf_groups_max, n_pf_coil_groups, nrws, gmat, bvec): """Solve a matrix using singular value decomposition. This routine solves the matrix equation for calculating the @@ -970,9 +970,9 @@ def solv(self, n_pf_groups_max, ngrp, nrws, gmat, bvec): :param n_pf_groups_max: maximum number of PF coil groups :type n_pf_groups_max: int - :param ngrp: number of coil groups, where all coils in a group have the + :param n_pf_coil_groups: number of coil groups, where all coils in a group have the same current, <= n_pf_groups_max - :type ngrp: int + :type n_pf_coil_groups: int :param nrws: actual number of rows to use :type nrws: int :param gmat: work array @@ -989,15 +989,15 @@ def solv(self, n_pf_groups_max, ngrp, nrws, gmat, bvec): umat, sigma, vmat = svd(gmat) - for i in range(ngrp): + for i in range(n_pf_coil_groups): work2[i] = 0.0e0 for j in range(nrws): work2[i] = work2[i] + umat[j, i] * bvec[j] # Compute currents - for i in range(ngrp): + for i in range(n_pf_coil_groups): zvec = 0.0e0 - for j in range(ngrp): + for j in range(n_pf_coil_groups): if sigma[j] > 1.0e-10: zvec = work2[j] / sigma[j] @@ -1318,7 +1318,7 @@ def peakb(self, i, ii, it): # Non-Central Solenoid coils' contributions jj = 0 - for iii in range(pfv.ngrp): + for iii in range(pfv.n_pf_coil_groups): for _jjj in range(pfv.ncls[iii]): jj = jj + 1 # Radius, z-coordinate and current for each coil @@ -1763,7 +1763,7 @@ def induct(self, output): # PF coil / plasma mutual inductances ncoils = 0 - for i in range(pfv.ngrp): + for i in range(pfv.n_pf_coil_groups): xpfpl = 0.0 ncoils = ncoils + pfv.ncls[i] rp = pfv.r_pf_coil_middle[ncoils - 1] @@ -1798,7 +1798,7 @@ def induct(self, output): zc[i] = zoh[i] ncoils = 0 - for i in range(pfv.ngrp): + for i in range(pfv.n_pf_coil_groups): xohpf = 0.0 ncoils = ncoils + pfv.ncls[i] rp = pfv.r_pf_coil_middle[ncoils - 1] @@ -3094,7 +3094,7 @@ def bfield(rc, zc, cc, rp, zp): @numba.njit(cache=True) -def rsid(npts, brin, bzin, nfix, ngrp, ccls, bfix, gmat): +def rsid(npts, brin, bzin, nfix, n_pf_coil_groups, ccls, bfix, gmat): """Computes the norm of the residual vectors. author: P J Knight, CCFE, Culham Science Centre @@ -3113,9 +3113,9 @@ def rsid(npts, brin, bzin, nfix, ngrp, ccls, bfix, gmat): :type bzin: numpy.ndarray :param nfix: number of coils with fixed currents, <= nfixmx :type nfix: int - :param ngrp: number of coil groups, where all coils in a group have the + :param n_pf_coil_groups: number of coil groups, where all coils in a group have the same current, <= n_pf_groups_max - :type ngrp: int + :type n_pf_coil_groups: int :param ccls: coil currents in each group (A) :type ccls: numpy.ndarray :param bfix: work array @@ -3136,7 +3136,7 @@ def rsid(npts, brin, bzin, nfix, ngrp, ccls, bfix, gmat): if nfix > 0: svec = bfix[i] - for j in range(ngrp): + for j in range(n_pf_coil_groups): svec = svec + gmat[i, j] * ccls[j] rvec = svec - brin[i] @@ -3150,7 +3150,7 @@ def rsid(npts, brin, bzin, nfix, ngrp, ccls, bfix, gmat): svec = 0.0e0 if nfix > 0: svec = bfix[i + npts] - for j in range(ngrp): + for j in range(n_pf_coil_groups): svec = svec + gmat[i + npts, j] * ccls[j] rvec = svec - bzin[i] @@ -3216,7 +3216,7 @@ def mtrx( zpts, brin, bzin, - ngrp, + n_pf_coil_groups, ncls, rcls, zcls, @@ -3249,9 +3249,9 @@ def mtrx( :type brin: numpy.ndarray :param bzin: field components at data points (T) :type bzin: numpy.ndarray - :param ngrp: number of coil groups, where all coils in a group have the + :param n_pf_coil_groups: number of coil groups, where all coils in a group have the same current, <= n_pf_groups_max - :type ngrp: int + :type n_pf_coil_groups: int :param ncls: number of coils in each group, each value <= nclsmx :type ncls: numpy.ndarray :param rcls: coords R(i,j), Z(i,j) of coil j in group i (m) @@ -3277,7 +3277,7 @@ def mtrx( bvec[i] = brin[i] - bfix[i] bvec[i + npts] = bzin[i] - bfix[i + npts] - for j in range(ngrp): + for j in range(n_pf_coil_groups): nc = ncls[j] _, gmat[i, j], gmat[i + npts, j], _ = bfield( @@ -3287,10 +3287,13 @@ def mtrx( # Add constraint equations nrws = 2 * npts - bvec[nrws : nrws + ngrp] = 0.0 - np.fill_diagonal(gmat[nrws : nrws + ngrp, :ngrp], ncls[:ngrp] * alfa) + bvec[nrws : nrws + n_pf_coil_groups] = 0.0 + np.fill_diagonal( + gmat[nrws : nrws + n_pf_coil_groups, :n_pf_coil_groups], + ncls[:n_pf_coil_groups] * alfa, + ) - nrws = 2 * npts + ngrp + nrws = 2 * npts + n_pf_coil_groups # numba doesnt like np.zeros(..., order="F") so this acts as a work # around to that missing signature diff --git a/process/power.py b/process/power.py index 8abc8bb501..b94a6011f3 100644 --- a/process/power.py +++ b/process/power.py @@ -92,7 +92,7 @@ def pfpwr(self, output: bool): # PF coil resistive power requirements # Bussing losses assume aluminium bussing with 100 A/cm**2 ic = -1 - ngrpt = pfcoil_variables.ngrp + ngrpt = pfcoil_variables.n_pf_coil_groups if build_variables.iohcl != 0: ngrpt = ngrpt + 1 diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index 94ce0c86f8..9d037bfc17 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -328,7 +328,7 @@ { "no": 64, "level": 3, - "message": "PFCOIL: ngrp is larger than n_pf_groups_max" + "message": "PFCOIL: n_pf_coil_groups is larger than n_pf_groups_max" }, { "no": 65, diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 791f8c4fc2..85eff55239 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -298,7 +298,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) use pfcoil_variables, only: rhopfbus, rjconpf, zref, fcuohsu, oh_steel_frac, vf, & coheof, sigpfcalw, alstroh, i_pf_conductor, fcupfsu, fvssu, etapsu, i_cs_stress, & fbmaxcs, ngc, rpf2, fcohbop, ohhghf, vfohc, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & - ngrp, i_pf_superconductor, nfxfh, alfapf, routr, sigpfcf, rho_pf_coil, bmaxcs_lim, & + n_pf_coil_groups, i_pf_superconductor, nfxfh, alfapf, routr, sigpfcf, rho_pf_coil, bmaxcs_lim, & ncls, nfixmx, cptdin, i_pf_location, i_sup_pf_shape, rref, i_pf_current, & ccl0_ma, ccls_ma, ld_ratio_cst use physics_variables, only: ipedestal, taumax, i_single_null, fvsbrnni, & @@ -1876,8 +1876,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('nfxfh') call parse_int_variable('nfxfh', nfxfh, 1, nfixmx/2, & 'Central Solenoid splitting parameter') - case ('ngrp') - call parse_int_variable('ngrp', ngrp, 0, n_pf_groups_max, & + case ('n_pf_coil_groups') + call parse_int_variable('n_pf_coil_groups', n_pf_coil_groups, 0, n_pf_groups_max, & 'No of groups of PF coils') case ('ohhghf') call parse_real_variable('ohhghf', ohhghf, 0.0D0, 2.0D0, & diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 62fb62c5ad..1e1a23b0f9 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -208,7 +208,7 @@ module pfcoil_variables !! number of filaments the top and bottom of the central solenoid should be broken !! into during scaling (5 - 10 is good) - integer :: ngrp + integer :: n_pf_coil_groups !! number of groups of PF coils. Symmetric coil pairs should all be in the same group integer :: nohc @@ -459,7 +459,7 @@ subroutine init_pfcoil_variables ncirt = 0 ncls = (/1,1,2,0,0,0,0,0,0,0,0,0/) nfxfh = 7 - ngrp = 3 + n_pf_coil_groups = 3 nohc = 0 ohhghf = 0.71D0 oh_steel_frac = 0.5D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 8510d1dd96..0ef2a1d2cc 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -1739,7 +1739,7 @@ i_pf_superconductor = 3 ncls = 1,1,2,2 * Number of groups of PF coils -ngrp = 4 +n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height ohhghf = 0.9 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index dded449775..2a68f4ee14 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -1740,7 +1740,7 @@ i_pf_superconductor = 3 ncls = 1,1,2,2 * Number of groups of PF coils -ngrp = 4 +n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height ohhghf = 0.9 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index d97bb07433..8bef9674f4 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -1740,7 +1740,7 @@ i_pf_superconductor = 3 ncls = 1,1,2,2 * Number of groups of PF coils -ngrp = 4 +n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height ohhghf = 0.9 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 05b7bbdaa6..2d829830e6 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -1740,7 +1740,7 @@ i_pf_superconductor = 3 ncls = 1,1,2,2 * Number of groups of PF coils -ngrp = 4 +n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height ohhghf = 0.9 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index b5f1c6f7ef..6c8e8d14f2 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -550,7 +550,7 @@ i_pf_superconductor = 3 ncls = 1,1,2,2 * Number of groups of PF coils -ngrp = 4 +n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height ohhghf = 0.9 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index f6381d3517..6b6125da57 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -1741,7 +1741,7 @@ i_pf_superconductor = 3 ncls = 1,1,2,2 * Number of groups of PF coils -ngrp = 4 +n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height ohhghf = 0.9 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 9ca3ead55e..1e35868a59 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -287,7 +287,7 @@ i_pf_location = 2,2,3,3 * Switch for location of PF coil group i; i_cs_superconductor = 1 * switch for superconductor material in central solenoid; i_pf_superconductor = 3 * switch for superconductor material in PF coils; ncls = 1,1,2,2 * number of PF coils in group j -ngrp = 4 * number of groups of PF coils; Symmetric coil pairs should all be in the same group +n_pf_coil_groups = 4 * number of groups of PF coils; Symmetric coil pairs should all be in the same group ohhghf = 0.9 * Central solenoid height / TF coil internal height oh_steel_frac = 0.4856940627014451 * central solenoid steel fraction (`iteration variable 122`) rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * average winding pack current density of PF coil i (A/m2) at time of peak diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index bd8b51ec90..640a7b49ce 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -229,7 +229,7 @@ fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; ncls = 1,1,2,2, * Number of pf coils in group j -ngrp = 4 * Number of groups of pf coils; +n_pf_coil_groups = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 7c1d6ad2b0..928e8e35e1 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -18027,7 +18027,7 @@ i_pf_superconductor = 3 ncls = 1,1,2,2 * Number of groups of PF coils -ngrp = 4 +n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height ohhghf = 0.9 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index c838447503..f18a2d1b37 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -9208,7 +9208,7 @@ fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; ncls = 1,1,2,2, * Number of pf coils in group j -ngrp = 4 * Number of groups of pf coils; +n_pf_coil_groups = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index ccd04b53a7..20cf2c6420 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -229,7 +229,7 @@ fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; ncls = 1,1,2,2, * Number of pf coils in group j -ngrp = 4 * Number of groups of pf coils; +n_pf_coil_groups = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index 87f0cddb4e..d28a529c65 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -229,7 +229,7 @@ fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; ncls = 1,1,2,2, * Number of pf coils in group j -ngrp = 4 * Number of groups of pf coils; +n_pf_coil_groups = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index abc084a482..67ff9aeb1f 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3399,7 +3399,7 @@ "nfxfh": 7.0, "ngc": "n_pf_groups_max*nclsmx", "ngc2": "ngc+2", - "ngrp": 3.0, + "n_pf_coil_groups": 3.0, "n_pf_groups_max": 10.0, "ni0": 0.0, "n_impurities": 14.0, @@ -10159,7 +10159,7 @@ "nfxfh": "number of filaments the top and bottom of the central solenoid should be broken\n into during scaling (5 - 10 is good)", "ngc": "maximum total number of coils across all groups", "ngc2": "new variable to include 2 additional circuits: plasma and central solenoid", - "ngrp": "number of groups of PF coils. Symmetric coil pairs should all be in the same group", + "n_pf_coil_groups": "number of groups of PF coils. Symmetric coil pairs should all be in the same group", "n_pf_groups_max": "maximum number of groups of PF coils", "ni0": "central ion density (/m3)", "n_impurities": "n_impurities /14/ FIX : number of ion species in impurity radiation model", @@ -18962,7 +18962,7 @@ "ncirt", "ncls", "nfxfh", - "ngrp", + "n_pf_coil_groups", "nohc", "ohhghf", "oh_steel_frac", @@ -20570,7 +20570,7 @@ "netau_sol": "real_variable", "nflutfmax": "real_variable", "nfxfh": "int_variable", - "ngrp": "int_variable", + "n_pf_coil_groups": "int_variable", "nineqns": "int_variable", "npdiv": "int_variable", "nphcdin": "int_variable", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 3bda8c5182..8a074c094a 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -63,7 +63,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "pfrmax", 0.0) monkeypatch.setattr(pfv, "fcohbop", 1.0) monkeypatch.setattr(pfv, "rjconpf", np.full(22, 1.1e7)) - monkeypatch.setattr(pfv, "ngrp", 4) + monkeypatch.setattr(pfv, "n_pf_coil_groups", 4) monkeypatch.setattr(pfv, "r_cs_middle", 3.0) monkeypatch.setattr(pfv, "ncls", np.array([1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0])) monkeypatch.setattr(pfv, "z_pf_coil_middle", np.full(22, 0.0)) @@ -244,7 +244,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): # Mocks for peakb() monkeypatch.setattr(bv, "iohcl", 1) monkeypatch.setattr(pfv, "waves", np.full([22, 6], 0.0)) - monkeypatch.setattr(pfv, "ngrp", 4) + monkeypatch.setattr(pfv, "n_pf_coil_groups", 4) monkeypatch.setattr(pfv, "ncls", np.array([1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0])) monkeypatch.setattr(pfv, "curpfb", np.full(22, 0.0)) monkeypatch.setattr(pfv, "curpff", np.full(22, 0.0)) @@ -345,7 +345,7 @@ def test_efc(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): ] cfix = np.full(nfixmx, 0.0) cfix[0:14] = 12547065.315963898 - ngrp = 4 + n_pf_coil_groups = 4 ncls = np.array([1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0]) # This 2D array argument discovered via gdb prints as a 1D array, therefore @@ -426,7 +426,7 @@ def test_efc(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): rfix, zfix, cfix, - ngrp, + n_pf_coil_groups, ncls, rcls, zcls, @@ -498,7 +498,7 @@ def test_mtrx(pfcoil: PFCoil): zpts = np.zeros(nptsmx) brin = np.zeros(nptsmx) bzin = np.zeros(nptsmx) - ngrp = 4 + n_pf_coil_groups = 4 ncls = np.array([1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0]) rcls = np.reshape( [ @@ -638,7 +638,7 @@ def test_mtrx(pfcoil: PFCoil): zpts, brin, bzin, - ngrp, + n_pf_coil_groups, ncls, rcls, zcls, @@ -1630,13 +1630,13 @@ def test_solv(pfcoil: PFCoil): :type pfcoil: process.pfcoil.PFCoil """ n_pf_groups_max = 3 - ngrp = 3 + n_pf_coil_groups = 3 nrws = 3 gmat = np.full((3, 3), 2.0, order="F") bvec = np.full(3, 1.0) ccls = pfcoil.solv( - n_pf_groups_max, ngrp, nrws, gmat, bvec + n_pf_groups_max, n_pf_coil_groups, nrws, gmat, bvec ) assert_array_almost_equal(ccls, np.array([-0.069036, 0.488642, 0.080394])) @@ -2361,7 +2361,7 @@ def test_peakb(monkeypatch: pytest.MonkeyPatch, pfcoil: PFCoil): ), ) monkeypatch.setattr(pfv, "coheof", 20726000) - monkeypatch.setattr(pfv, "ngrp", 4) + monkeypatch.setattr(pfv, "n_pf_coil_groups", 4) monkeypatch.setattr(pfv, "bpf", np.zeros(22, dtype=int)) # maybe monkeypatch.setattr( pfv, @@ -2863,7 +2863,7 @@ def test_induct(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): ) monkeypatch.setattr(pfv, "sxlg", np.ones((22, 22), dtype=int)) monkeypatch.setattr(pfv, "r_cs_middle", 2.6084100000000001) - monkeypatch.setattr(pfv, "ngrp", 4) + monkeypatch.setattr(pfv, "n_pf_coil_groups", 4) monkeypatch.setattr(pfv, "ncls", np.array([1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0])) monkeypatch.setattr( pfv, diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 0dda8b82b6..a0ff67f1d2 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -550,7 +550,7 @@ i_pf_superconductor = 3 ncls = 1,1,2,2 * Number of groups of PF coils -ngrp = 4 +n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height ohhghf = 0.9 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index df90978a96..80efad46e6 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -532,7 +532,7 @@ i_pf_superconductor = 3 ncls = 1,1,2,2 * Number of groups of PF coils -ngrp = 4 +n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height ohhghf = 0.9 diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index 83b481ff76..6725dabeb8 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -287,7 +287,7 @@ i_pf_location = 2,2,3,3 * Switch for location of PF coil group i; i_cs_superconductor = 1 * switch for superconductor material in central solenoid; i_pf_superconductor = 3 * switch for superconductor material in PF coils; ncls = 1,1,2,2 * number of PF coils in group j -ngrp = 4 * number of groups of PF coils; Symmetric coil pairs should all be in the same group +n_pf_coil_groups = 4 * number of groups of PF coils; Symmetric coil pairs should all be in the same group ohhghf = 0.9 * Central solenoid height / TF coil internal height oh_steel_frac = 0.4856940627014451 * central solenoid steel fraction (`iteration variable 122`) rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * average winding pack current density of PF coil i (A/m2) at time of peak diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index ef3c844086..982d580e06 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1946,7 +1946,7 @@ ncls = 2,2,2,2 * DESCRIPTION: Number of PF Coils in Group j * JUSTIFICATION: Design choice, symmetric top and bottom -ngrp = 4 +n_pf_coil_groups = 4 * DESCRIPTION: Number of Groups of PF Coils * JUSTIFICATION: Design choice, symmetric top and bottom diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index de7d5fea92..12ce7dd74a 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -551,7 +551,7 @@ i_pf_superconductor = 3 ncls = 1,1,2,2 * Number of groups of PF coils -ngrp = 4 +n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height ohhghf = 0.9 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index ca242a9e5d..8709afaff8 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -1742,7 +1742,7 @@ i_pf_superconductor = 3 ncls = 1,1,2,2 * Number of groups of PF coils -ngrp = 4 +n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height ohhghf = 0.9 diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index a908e90f15..313cd9a6d1 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -52,7 +52,7 @@ def test_rsid(pfcoil): brin = np.zeros(nptsmx) bzin = np.zeros(nptsmx) nfix = 14 - ngrp = 4 + n_pf_coil_groups = 4 ccls = np.array([ 14742063.826112622, 20032681.634901665, @@ -901,7 +901,7 @@ def test_rsid(pfcoil): ssq_exp = 0.0006400910095285954 brssq, brnrm, bzssq, bznrm, ssq = rsid( - npts, brin, bzin, nfix, ngrp, ccls, bfix, gmat + npts, brin, bzin, nfix, n_pf_coil_groups, ccls, bfix, gmat ) assert brssq == pytest.approx(brssq_exp) diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index d3def2b5dc..6537b00738 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -191,7 +191,7 @@ class PfpwrParam(NamedTuple): srcktpm: Any = None - ngrp: Any = None + n_pf_coil_groups: Any = None c_pf_coil_turn: Any = None @@ -280,7 +280,7 @@ class PfpwrParam(NamedTuple): ensxpfm=0, acptmax=0, srcktpm=0, - ngrp=4, + n_pf_coil_groups=4, c_pf_coil_turn=np.array( ( ( @@ -1023,7 +1023,7 @@ class PfpwrParam(NamedTuple): ensxpfm=37429.525515086898, acptmax=24.816666666666666, srcktpm=1071.1112934857531, - ngrp=4, + n_pf_coil_groups=4, c_pf_coil_turn=np.array( ( ( @@ -1796,7 +1796,9 @@ def test_pfpwr(pfpwrparam, monkeypatch, power): monkeypatch.setattr(pf_power_variables, "srcktpm", pfpwrparam.srcktpm) - monkeypatch.setattr(pfcoil_variables, "ngrp", pfpwrparam.ngrp) + monkeypatch.setattr( + pfcoil_variables, "n_pf_coil_groups", pfpwrparam.n_pf_coil_groups + ) monkeypatch.setattr(pfcoil_variables, "c_pf_coil_turn", pfpwrparam.c_pf_coil_turn) From 820a9c5f83e1a3db2e6c4de63ffaa7eaee0df6aa Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 14:51:20 +0000 Subject: [PATCH 22/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'ncirt'=20to=20'n?= =?UTF-8?q?=5Fpf=5Fcs=5Fplasma=5Fcircuits'=20across=20multiple=20files=20f?= =?UTF-8?q?or=20consistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 ++-- process/pfcoil.py | 98 +++++++++++-------- process/power.py | 14 +-- process/pulse.py | 4 +- source/fortran/pfcoil_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++--- tests/integration/data/scan_MFILE.DAT | 18 ++-- tests/integration/ref_dicts.json | 6 +- tests/integration/test_pfcoil_int.py | 10 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_pfcoil.py | 2 +- tests/unit/test_power.py | 10 +- tests/unit/test_pulse.py | 10 +- 23 files changed, 134 insertions(+), 112 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 542aafc4a7..2e9d08c144 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -878,7 +878,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.8528E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.9610E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.4447E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.8574E+07 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index da427e92ff..e34258c0e4 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -873,7 +873,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.3971E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.7816E+07 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 0ab4cca97f..76a34af564 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -873,7 +873,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.3971E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.7816E+07 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 91006cc598..e9247edffb 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -873,7 +873,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.3971E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.7816E+07 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 8615e571d4..ac5aa37f8d 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -873,7 +873,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.3971E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.7816E+07 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 0e04760013..1063a815be 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -709,7 +709,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 PF_Circuit_01_-_Time_point_02_(A)_______________________________________ (pfc01t02)____________________ 1.2790E+07 PF_Circuit_01_-_Time_point_03_(A)_______________________________________ (pfc01t03)____________________ 1.5750E+07 @@ -1704,7 +1704,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 PF_Circuit_01_-_Time_point_02_(A)_______________________________________ (pfc01t02)____________________ 1.2790E+07 PF_Circuit_01_-_Time_point_03_(A)_______________________________________ (pfc01t03)____________________ 1.5750E+07 @@ -2699,7 +2699,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 PF_Circuit_01_-_Time_point_02_(A)_______________________________________ (pfc01t02)____________________ 1.2790E+07 PF_Circuit_01_-_Time_point_03_(A)_______________________________________ (pfc01t03)____________________ 1.5750E+07 @@ -3694,7 +3694,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 PF_Circuit_01_-_Time_point_02_(A)_______________________________________ (pfc01t02)____________________ 1.2790E+07 PF_Circuit_01_-_Time_point_03_(A)_______________________________________ (pfc01t03)____________________ 1.5750E+07 @@ -4689,7 +4689,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 PF_Circuit_01_-_Time_point_02_(A)_______________________________________ (pfc01t02)____________________ 1.2790E+07 PF_Circuit_01_-_Time_point_03_(A)_______________________________________ (pfc01t03)____________________ 1.5750E+07 @@ -5684,7 +5684,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 PF_Circuit_01_-_Time_point_02_(A)_______________________________________ (pfc01t02)____________________ 1.2790E+07 PF_Circuit_01_-_Time_point_03_(A)_______________________________________ (pfc01t03)____________________ 1.5750E+07 @@ -6679,7 +6679,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 PF_Circuit_01_-_Time_point_02_(A)_______________________________________ (pfc01t02)____________________ 1.2790E+07 PF_Circuit_01_-_Time_point_03_(A)_______________________________________ (pfc01t03)____________________ 1.5750E+07 @@ -7674,7 +7674,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 PF_Circuit_01_-_Time_point_02_(A)_______________________________________ (pfc01t02)____________________ 1.2790E+07 PF_Circuit_01_-_Time_point_03_(A)_______________________________________ (pfc01t03)____________________ 1.5750E+07 @@ -8669,7 +8669,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 PF_Circuit_01_-_Time_point_02_(A)_______________________________________ (pfc01t02)____________________ 1.2790E+07 PF_Circuit_01_-_Time_point_03_(A)_______________________________________ (pfc01t03)____________________ 1.5750E+07 diff --git a/process/pfcoil.py b/process/pfcoil.py index f6c632a8bf..c663f460a7 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -87,7 +87,7 @@ def pfcoil(self): top_bottom = 1 # Set up the number of PF coils including the Central Solenoid (nohc), - # and the number of PF circuits including the plasma (ncirt) + # and the number of PF circuits including the plasma (n_pf_cs_plasma_circuits) if pfv.n_pf_coil_groups > pfv.n_pf_groups_max: eh.idiags[0] = pfv.n_pf_coil_groups eh.idiags[1] = pfv.n_pf_groups_max @@ -111,7 +111,7 @@ def pfcoil(self): pfv.ncls[pfv.n_pf_coil_groups] = 1 # Add one for the plasma - pfv.ncirt = pfv.nohc + 1 + pfv.n_pf_cs_plasma_circuits = pfv.nohc + 1 # Overall current density in the Central Solenoid at beginning of pulse pfv.cohbop = pfv.coheof * pfv.fcohbop @@ -439,7 +439,7 @@ def pfcoil(self): for _i in range(pfv.ncls[ccount]): pfflux = pfflux + ( pf.ccls[ccount] - * pfv.sxlg[nocoil, pfv.ncirt - 1] + * pfv.sxlg[nocoil, pfv.n_pf_cs_plasma_circuits - 1] / pfv.n_pf_coil_turns[nocoil] ) nocoil = nocoil + 1 @@ -451,8 +451,8 @@ def pfcoil(self): # Required current change in CS coil # Proposed new calculation... - # dics = csflux / sxlg(nohc,ncirt) - # BUT... sxlg(nohc,ncirt) is around 2000 times ddics below... + # dics = csflux / sxlg(nohc,n_pf_cs_plasma_circuits) + # BUT... sxlg(nohc,n_pf_cs_plasma_circuits) is around 2000 times ddics below... ddics = ( 4.0e-7 @@ -777,18 +777,18 @@ def pfcoil(self): # Generate coil currents as a function of time using # user-provided waveforms etc. (cptdin, fcohbop, fcohbof) for k in range(6): # time points - for i in range(pfv.ncirt - 1): + for i in range(pfv.n_pf_cs_plasma_circuits - 1): pfv.c_pf_coil_turn[i, k] = pfv.waves[i, k] * math.copysign( pfv.cptdin[i], pfv.ric[i] ) # Plasma wave form - pfv.c_pf_coil_turn[pfv.ncirt - 1, 0] = 0.0e0 - pfv.c_pf_coil_turn[pfv.ncirt - 1, 1] = 0.0e0 - pfv.c_pf_coil_turn[pfv.ncirt - 1, 2] = pv.plasma_current - pfv.c_pf_coil_turn[pfv.ncirt - 1, 3] = pv.plasma_current - pfv.c_pf_coil_turn[pfv.ncirt - 1, 4] = pv.plasma_current - pfv.c_pf_coil_turn[pfv.ncirt - 1, 5] = 0.0e0 + pfv.c_pf_coil_turn[pfv.n_pf_cs_plasma_circuits - 1, 0] = 0.0e0 + pfv.c_pf_coil_turn[pfv.n_pf_cs_plasma_circuits - 1, 1] = 0.0e0 + pfv.c_pf_coil_turn[pfv.n_pf_cs_plasma_circuits - 1, 2] = pv.plasma_current + pfv.c_pf_coil_turn[pfv.n_pf_cs_plasma_circuits - 1, 3] = pv.plasma_current + pfv.c_pf_coil_turn[pfv.n_pf_cs_plasma_circuits - 1, 4] = pv.plasma_current + pfv.c_pf_coil_turn[pfv.n_pf_cs_plasma_circuits - 1, 5] = 0.0e0 def efc( self, @@ -1468,26 +1468,34 @@ def vsec(self): """ if bv.iohcl == 0: # No Central Solenoid - pf.nef = pfv.ncirt - 1 + pf.nef = pfv.n_pf_cs_plasma_circuits - 1 else: - pf.nef = pfv.ncirt - 2 + pf.nef = pfv.n_pf_cs_plasma_circuits - 2 pfv.vsefsu = 0.0e0 for i in range(pf.nef): - pf.vsdum[i, 0] = pfv.sxlg[pfv.ncirt - 1, i] * pfv.c_pf_coil_turn[i, 1] - pf.vsdum[i, 1] = pfv.sxlg[pfv.ncirt - 1, i] * pfv.c_pf_coil_turn[i, 2] + pf.vsdum[i, 0] = ( + pfv.sxlg[pfv.n_pf_cs_plasma_circuits - 1, i] * pfv.c_pf_coil_turn[i, 1] + ) + pf.vsdum[i, 1] = ( + pfv.sxlg[pfv.n_pf_cs_plasma_circuits - 1, i] * pfv.c_pf_coil_turn[i, 2] + ) pfv.vsefsu = pfv.vsefsu + (pf.vsdum[i, 1] - pf.vsdum[i, 0]) # Central Solenoid startup volt-seconds if bv.iohcl != 0: pf.vsdum[pfv.nohc - 1, 0] = ( - pfv.sxlg[pfv.ncirt - 1, pfv.ncirt - 2] - * pfv.c_pf_coil_turn[pfv.ncirt - 2, 1] + pfv.sxlg[ + pfv.n_pf_cs_plasma_circuits - 1, pfv.n_pf_cs_plasma_circuits - 2 + ] + * pfv.c_pf_coil_turn[pfv.n_pf_cs_plasma_circuits - 2, 1] ) pf.vsdum[pfv.nohc - 1, 1] = ( - pfv.sxlg[pfv.ncirt - 1, pfv.ncirt - 2] - * pfv.c_pf_coil_turn[pfv.ncirt - 2, 2] + pfv.sxlg[ + pfv.n_pf_cs_plasma_circuits - 1, pfv.n_pf_cs_plasma_circuits - 2 + ] + * pfv.c_pf_coil_turn[pfv.n_pf_cs_plasma_circuits - 2, 2] ) pfv.vsohsu = pf.vsdum[pfv.nohc - 1, 1] - pf.vsdum[pfv.nohc - 1, 0] @@ -1497,15 +1505,19 @@ def vsec(self): # Burn volt-seconds if bv.iohcl != 0: pf.vsdum[pfv.nohc - 1, 2] = ( - pfv.sxlg[pfv.ncirt - 1, pfv.ncirt - 2] - * pfv.c_pf_coil_turn[pfv.ncirt - 2, 4] + pfv.sxlg[ + pfv.n_pf_cs_plasma_circuits - 1, pfv.n_pf_cs_plasma_circuits - 2 + ] + * pfv.c_pf_coil_turn[pfv.n_pf_cs_plasma_circuits - 2, 4] ) pfv.vsohbn = pf.vsdum[pfv.nohc - 1, 2] - pf.vsdum[pfv.nohc - 1, 1] # PF volt-seconds during burn pfv.vsefbn = 0.0e0 for i in range(pf.nef): - pf.vsdum[i, 2] = pfv.sxlg[pfv.ncirt - 1, i] * pfv.c_pf_coil_turn[i, 4] + pf.vsdum[i, 2] = ( + pfv.sxlg[pfv.n_pf_cs_plasma_circuits - 1, i] * pfv.c_pf_coil_turn[i, 4] + ) pfv.vsefbn = pfv.vsefbn + (pf.vsdum[i, 2] - pf.vsdum[i, 1]) pfv.vsbn = pfv.vsohbn + pfv.vsefbn @@ -1750,15 +1762,17 @@ def induct(self, output): xc[ii] = 0.5e0 * (xcin[ii] + xcout[ii]) xohpl = xohpl + xc[ii] - pfv.sxlg[pfv.ncirt - 1, pfv.nohc - 1] = ( + pfv.sxlg[pfv.n_pf_cs_plasma_circuits - 1, pfv.nohc - 1] = ( xohpl / (nplas * noh) * pfv.n_pf_coil_turns[pfv.nohc - 1] ) - pfv.sxlg[pfv.nohc - 1, pfv.ncirt - 1] = pfv.sxlg[ - pfv.ncirt - 1, pfv.nohc - 1 + pfv.sxlg[pfv.nohc - 1, pfv.n_pf_cs_plasma_circuits - 1] = pfv.sxlg[ + pfv.n_pf_cs_plasma_circuits - 1, pfv.nohc - 1 ] # Plasma self inductance - pfv.sxlg[pfv.ncirt - 1, pfv.ncirt - 1] = pv.ind_plasma + pfv.sxlg[pfv.n_pf_cs_plasma_circuits - 1, pfv.n_pf_cs_plasma_circuits - 1] = ( + pv.ind_plasma + ) # PF coil / plasma mutual inductances ncoils = 0 @@ -1774,11 +1788,11 @@ def induct(self, output): for j in range(pfv.ncls[i]): ncoilj = ncoils + 1 - (j + 1) - pfv.sxlg[ncoilj - 1, pfv.ncirt - 1] = ( + pfv.sxlg[ncoilj - 1, pfv.n_pf_cs_plasma_circuits - 1] = ( xpfpl / nplas * pfv.n_pf_coil_turns[ncoilj - 1] ) - pfv.sxlg[pfv.ncirt - 1, ncoilj - 1] = pfv.sxlg[ - ncoilj - 1, pfv.ncirt - 1 + pfv.sxlg[pfv.n_pf_cs_plasma_circuits - 1, ncoilj - 1] = pfv.sxlg[ + ncoilj - 1, pfv.n_pf_cs_plasma_circuits - 1 ] if bv.iohcl != 0: @@ -1867,18 +1881,18 @@ def induct(self, output): for ig in range(pf.nef): op.write( self.outfile, - f"{ig}\t{pfv.sxlg[: pfv.ncirt, ig]}", + f"{ig}\t{pfv.sxlg[: pfv.n_pf_cs_plasma_circuits, ig]}", ) if bv.iohcl != 0: op.write( self.outfile, - f"CS\t\t\t{pfv.sxlg[: pfv.ncirt, pfv.ncirt - 2]}", + f"CS\t\t\t{pfv.sxlg[: pfv.n_pf_cs_plasma_circuits, pfv.n_pf_cs_plasma_circuits - 2]}", ) op.write( self.outfile, - f"Plasma\t{pfv.sxlg[: pfv.ncirt, pfv.ncirt - 1]}", + f"Plasma\t{pfv.sxlg[: pfv.n_pf_cs_plasma_circuits, pfv.n_pf_cs_plasma_circuits - 1]}", ) def outpf(self): @@ -2609,7 +2623,7 @@ def outvolt(self): op.ocmmnt(self.outfile, "circuit") - for k in range(pfv.ncirt - 1): + for k in range(pfv.n_pf_cs_plasma_circuits - 1): line = f"\t{k}\t\t" for jj in range(6): line += f"\t{pfv.c_pf_coil_turn[k, jj] * pfv.n_pf_coil_turns[k]:.3e}" @@ -2617,13 +2631,13 @@ def outvolt(self): line = "Plasma (A)\t\t" for jj in range(6): - line += f"\t{pfv.c_pf_coil_turn[pfv.ncirt - 1, jj]:.3e}" + line += f"\t{pfv.c_pf_coil_turn[pfv.n_pf_cs_plasma_circuits - 1, jj]:.3e}" op.write(self.outfile, line) op.oblnkl(self.outfile) op.ocmmnt(self.outfile, "This consists of: CS coil field balancing:") - for k in range(pfv.ncirt - 1): + for k in range(pfv.n_pf_cs_plasma_circuits - 1): op.write( self.outfile, ( @@ -2638,7 +2652,7 @@ def outvolt(self): op.oblnkl(self.outfile) op.ocmmnt(self.outfile, "And: equilibrium field:") - for k in range(pfv.ncirt - 1): + for k in range(pfv.n_pf_cs_plasma_circuits - 1): op.write( self.outfile, ( @@ -2669,15 +2683,15 @@ def outvolt(self): op.ovarin( self.outfile, "Number of PF circuits including CS and plasma", - "(ncirt)", - pfv.ncirt, + "(n_pf_cs_plasma_circuits)", + pfv.n_pf_cs_plasma_circuits, ) - for k in range(pfv.ncirt): + for k in range(pfv.n_pf_cs_plasma_circuits): for jjj in range(6): - if k == pfv.ncirt - 1: + if k == pfv.n_pf_cs_plasma_circuits - 1: circuit_name = f"Plasma Time point {jjj} (A)" circuit_var_name = f"(plasmat{jjj})" - elif k == pfv.ncirt - 2: + elif k == pfv.n_pf_cs_plasma_circuits - 2: circuit_name = f"CS Circuit Time point {jjj} (A)" circuit_var_name = f"(cs t{jjj})" else: diff --git a/process/power.py b/process/power.py index b94a6011f3..a0679535f7 100644 --- a/process/power.py +++ b/process/power.py @@ -153,10 +153,10 @@ def pfpwr(self, output: bool): powpfr = 0.0e0 powpfr2 = 0.0e0 - # pfcoil_variables.ncirt : total number of PF coils (including Central Solenoid and plasma) - # plasma is #ncirt, and Central Solenoid is #(pfcoil_variables.ncirt-1) + # pfcoil_variables.n_pf_cs_plasma_circuits : total number of PF coils (including Central Solenoid and plasma) + # plasma is #n_pf_cs_plasma_circuits, and Central Solenoid is #(pfcoil_variables.n_pf_cs_plasma_circuits-1) # pfcoil_variables.sxlg(i,j) : mutual inductance between coil i and j - for i in range(pfcoil_variables.ncirt): + for i in range(pfcoil_variables.n_pf_cs_plasma_circuits): powpfii[i] = 0.0e0 vpfi[i] = 0.0e0 @@ -168,7 +168,7 @@ def pfpwr(self, output: bool): ): # Loop over all coils in each group jpf = jpf + 1 inductxcurrent[:] = 0.0e0 - for ipf in range(pfcoil_variables.ncirt): + for ipf in range(pfcoil_variables.n_pf_cs_plasma_circuits): # Voltage in circuit jpf due to change in current from circuit ipf vpfij = ( pfcoil_variables.sxlg[jpf, ipf] @@ -284,12 +284,14 @@ def pfpwr(self, output: bool): heat_transport_variables.peakmva = max((powpfr + powpfi), powpfr2) pf_power_variables.vpfskv = 20.0e0 - pf_power_variables.pfckts = (pfcoil_variables.ncirt - 2) + 6.0e0 + pf_power_variables.pfckts = ( + pfcoil_variables.n_pf_cs_plasma_circuits - 2 + ) + 6.0e0 pf_power_variables.spfbusl = pfbusl * pf_power_variables.pfckts pf_power_variables.acptmax = 0.0e0 pf_power_variables.spsmva = 0.0e0 - for jpf in range(pfcoil_variables.ncirt - 1): + for jpf in range(pfcoil_variables.n_pf_cs_plasma_circuits - 1): # Power supply MVA for each PF circuit psmva[jpf] = 1.0e-6 * abs(vpfi[jpf] * pfcoil_variables.cptdin[jpf]) diff --git a/process/pulse.py b/process/pulse.py index d8879997ae..ae34a45037 100644 --- a/process/pulse.py +++ b/process/pulse.py @@ -83,7 +83,9 @@ def tohswg(self, output: bool) -> None: # Mutual inductance between Central Solenoid and plasma (H) - m = pfcoil_variables.sxlg[pfcoil_variables.nohc - 1, pfcoil_variables.ncirt - 1] + m = pfcoil_variables.sxlg[ + pfcoil_variables.nohc - 1, pfcoil_variables.n_pf_cs_plasma_circuits - 1 + ] # Self inductance of Central Solenoid (H) diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 1e1a23b0f9..a535a8271f 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -198,7 +198,7 @@ module pfcoil_variables real(dp) :: jcableoh_eof !! central solenoid cable critical current density (A/m2) at end-of-flattop - integer :: ncirt + integer :: n_pf_cs_plasma_circuits !! number of PF circuits (including central solenoid and plasma) integer, dimension(n_pf_groups_max+2) :: ncls @@ -456,7 +456,7 @@ subroutine init_pfcoil_variables jscoh_eof = 0.0D0 jcableoh_bop = 0.0D0 jcableoh_eof = 0.0D0 - ncirt = 0 + n_pf_cs_plasma_circuits = 0 ncls = (/1,1,2,0,0,0,0,0,0,0,0,0/) nfxfh = 7 n_pf_coil_groups = 3 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 0ef2a1d2cc..e0ac3ede91 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -872,7 +872,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.3971E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.7816E+07 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 2a68f4ee14..8488d93cd3 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -873,7 +873,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.3971E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.7816E+07 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 8bef9674f4..0459bc6c69 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -873,7 +873,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.3971E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.7816E+07 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 2d829830e6..2733ba7e10 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -873,7 +873,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.3971E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.7816E+07 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 6b6125da57..b417c342f4 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -876,7 +876,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4577E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.3540E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.3862E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.7637E+07 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 928e8e35e1..a0857de79e 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -874,7 +874,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3618E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.8251E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.4444E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.8411E+07 @@ -2037,7 +2037,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3607E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.9479E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.4556E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.8653E+07 @@ -3200,7 +3200,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3661E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.0517E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.4650E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.8855E+07 @@ -4363,7 +4363,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3720E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.0952E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.4639E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.8852E+07 @@ -5526,7 +5526,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3460E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.9731E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.4547E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.8668E+07 @@ -6689,7 +6689,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3261E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.8444E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.4403E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.8425E+07 @@ -7852,7 +7852,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3271E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.8841E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.4385E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.8421E+07 @@ -9015,7 +9015,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3278E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.0105E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.4491E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.8627E+07 @@ -10178,7 +10178,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3240E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.1463E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.4583E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.8808E+07 @@ -11341,7 +11341,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3251E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.1684E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.4575E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.8821E+07 @@ -12504,7 +12504,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3398E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.0290E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.4495E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.8656E+07 @@ -13667,7 +13667,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3669E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.9196E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.4411E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.8475E+07 @@ -14830,7 +14830,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3704E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.9463E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.4402E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.8486E+07 @@ -15993,7 +15993,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3585E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.0470E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.4505E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.8698E+07 @@ -17156,7 +17156,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3499E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.1467E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.4608E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.8912E+07 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index f18a2d1b37..bb0c5083df 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -709,7 +709,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 PF_Circuit_01_-_Time_point_02_(A)_______________________________________ (pfc01t02)____________________ 1.2790E+07 PF_Circuit_01_-_Time_point_03_(A)_______________________________________ (pfc01t03)____________________ 1.5750E+07 @@ -1704,7 +1704,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 PF_Circuit_01_-_Time_point_02_(A)_______________________________________ (pfc01t02)____________________ 1.2790E+07 PF_Circuit_01_-_Time_point_03_(A)_______________________________________ (pfc01t03)____________________ 1.5750E+07 @@ -2699,7 +2699,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 PF_Circuit_01_-_Time_point_02_(A)_______________________________________ (pfc01t02)____________________ 1.2790E+07 PF_Circuit_01_-_Time_point_03_(A)_______________________________________ (pfc01t03)____________________ 1.5750E+07 @@ -3694,7 +3694,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 PF_Circuit_01_-_Time_point_02_(A)_______________________________________ (pfc01t02)____________________ 1.2790E+07 PF_Circuit_01_-_Time_point_03_(A)_______________________________________ (pfc01t03)____________________ 1.5750E+07 @@ -4689,7 +4689,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 PF_Circuit_01_-_Time_point_02_(A)_______________________________________ (pfc01t02)____________________ 1.2790E+07 PF_Circuit_01_-_Time_point_03_(A)_______________________________________ (pfc01t03)____________________ 1.5750E+07 @@ -5684,7 +5684,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 PF_Circuit_01_-_Time_point_02_(A)_______________________________________ (pfc01t02)____________________ 1.2790E+07 PF_Circuit_01_-_Time_point_03_(A)_______________________________________ (pfc01t03)____________________ 1.5750E+07 @@ -6679,7 +6679,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 PF_Circuit_01_-_Time_point_02_(A)_______________________________________ (pfc01t02)____________________ 1.2790E+07 PF_Circuit_01_-_Time_point_03_(A)_______________________________________ (pfc01t03)____________________ 1.5750E+07 @@ -7674,7 +7674,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 PF_Circuit_01_-_Time_point_02_(A)_______________________________________ (pfc01t02)____________________ 1.2790E+07 PF_Circuit_01_-_Time_point_03_(A)_______________________________________ (pfc01t03)____________________ 1.5750E+07 @@ -8669,7 +8669,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 PF_Circuit_01_-_Time_point_02_(A)_______________________________________ (pfc01t02)____________________ 1.2790E+07 PF_Circuit_01_-_Time_point_03_(A)_______________________________________ (pfc01t03)____________________ 1.5750E+07 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 67ff9aeb1f..1d94be5a75 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3359,7 +3359,7 @@ "nbshinefmax": 0.001, "nbshinemw": 0.0, "ncalls": 0.0, - "ncirt": 0.0, + "n_pf_cs_plasma_circuits": 0.0, "ncls": [ 1.0, 1.0, @@ -10132,7 +10132,7 @@ "nbshinefmax": "maximum neutral beam shine-through fraction (`constraint equation 59`)", "nbshinemw": "neutral beam shine-through power", "ncalls": "ncalls : number of function calls during solution", - "ncirt": "number of PF circuits (including central solenoid and plasma)", + "n_pf_cs_plasma_circuits": "number of PF circuits (including central solenoid and plasma)", "ncls": "number of PF coils in group j", "nclsmx": "maximum number of PF coils in a given group", "ncool": "number of centrepost coolant tubes", @@ -18959,7 +18959,7 @@ "jscoh_eof", "jcableoh_bop", "jcableoh_eof", - "ncirt", + "n_pf_cs_plasma_circuits", "ncls", "nfxfh", "n_pf_coil_groups", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 8a074c094a..ccf4676ea2 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -85,14 +85,14 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "z_pf_coil_lower", np.full(22, 0.0)) monkeypatch.setattr(pfv, "m_pf_coil_conductor", np.full(22, 0.0)) monkeypatch.setattr(pfv, "vf", np.full(22, 3.0e-1)) - monkeypatch.setattr(pfv, "turns", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "n_pf_coil_turns", np.full(22, 0.0)) monkeypatch.setattr(pfv, "curpfs", np.full(22, 0.0)) monkeypatch.setattr(pfv, "r_pf_coil_middle", np.full(22, 0.0)) monkeypatch.setattr(pfv, "zref", [3.6, 1.2, 2.5, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0]) monkeypatch.setattr(pfv, "pfmmax", 0.0) monkeypatch.setattr(pfv, "i_pf_conductor", 0) monkeypatch.setattr(pfv, "alfapf", 5.0e-10) - monkeypatch.setattr(pfv, "ncirt", 8) + monkeypatch.setattr(pfv, "n_pf_cs_plasma_circuits", 8) monkeypatch.setattr(pfv, "rho_pf_coil", 2.5e-8) monkeypatch.setattr(pfv, "c_pf_coil_turn", np.full([22, 6], 0.0)) monkeypatch.setattr(pfv, "waves", np.full([22, 6], 0.0)) @@ -228,7 +228,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "z_pf_coil_upper", np.full(22, 0.0)) monkeypatch.setattr(pfv, "m_pf_coil_conductor", np.full(22, 0.0)) monkeypatch.setattr(pfv, "z_pf_coil_lower", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "turns", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "n_pf_coil_turns", np.full(22, 0.0)) monkeypatch.setattr(pfv, "m_pf_coil_structure", np.full(22, 0.0)) monkeypatch.setattr(pfv, "a_oh_turn", 0.0) monkeypatch.setattr(tfv, "dcond", np.full(9, 9.0e3)) @@ -2779,7 +2779,7 @@ def test_induct(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): monkeypatch.setattr(pfv, "nohc", 7) monkeypatch.setattr( pfv, - "turns", + "n_pf_coil_turns", np.array([ 349.33800535811901, 474.70809561378354, @@ -2893,7 +2893,7 @@ def test_induct(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): 0, ]), ) - monkeypatch.setattr(pfv, "ncirt", 8) + monkeypatch.setattr(pfv, "n_pf_cs_plasma_circuits", 8) monkeypatch.setattr( pfv, "r_pf_coil_inner", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 8709afaff8..2966dcb1d1 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -876,7 +876,7 @@ Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4577E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.3540E-01 OP # PF Circuit Waveform Data # - Number_of_PF_circuits_including_CS_and_plasma___________________________ (ncirt)_______________________ 8 + Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 PF_Circuit_0_Time_point_1_(A)___________________________________________ (pfc0t1)______________________ 1.3862E+07 PF_Circuit_0_Time_point_2_(A)___________________________________________ (pfc0t2)______________________ 1.7637E+07 diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index 313cd9a6d1..de03ddf150 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1416,7 +1416,7 @@ def test_vsec(pfcoil, monkeypatch): monkeypatch.setattr(pfv, "vsoh", 0) monkeypatch.setattr(pfv, "vssu", 0) monkeypatch.setattr(pfv, "vstot", 0) - monkeypatch.setattr(pfv, "ncirt", 8) + monkeypatch.setattr(pfv, "n_pf_cs_plasma_circuits", 8) monkeypatch.setattr( pfv, "sxlg", diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 6537b00738..a25aabd1a0 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -199,7 +199,7 @@ class PfpwrParam(NamedTuple): rho_pf_coil: Any = None - ncirt: Any = None + n_pf_cs_plasma_circuits: Any = None ncls: Any = None @@ -432,7 +432,7 @@ class PfpwrParam(NamedTuple): ).transpose(), pfwpmw=0, rho_pf_coil=0, - ncirt=8, + n_pf_cs_plasma_circuits=8, ncls=np.array( np.array((1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0), order="F"), order="F" ).transpose(), @@ -1175,7 +1175,7 @@ class PfpwrParam(NamedTuple): ).transpose(), pfwpmw=0.89998039031509891, rho_pf_coil=0, - ncirt=8, + n_pf_cs_plasma_circuits=8, ncls=np.array( np.array((1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0), order="F"), order="F" ).transpose(), @@ -1806,7 +1806,9 @@ def test_pfpwr(pfpwrparam, monkeypatch, power): monkeypatch.setattr(pfcoil_variables, "rho_pf_coil", pfpwrparam.rho_pf_coil) - monkeypatch.setattr(pfcoil_variables, "ncirt", pfpwrparam.ncirt) + monkeypatch.setattr( + pfcoil_variables, "n_pf_cs_plasma_circuits", pfpwrparam.n_pf_cs_plasma_circuits + ) monkeypatch.setattr(pfcoil_variables, "ncls", pfpwrparam.ncls) diff --git a/tests/unit/test_pulse.py b/tests/unit/test_pulse.py index e05ec030d5..6de89dff3d 100644 --- a/tests/unit/test_pulse.py +++ b/tests/unit/test_pulse.py @@ -30,7 +30,7 @@ class TohswgParam(NamedTuple): vpfskv: Any = None - ncirt: Any = None + n_pf_cs_plasma_circuits: Any = None i_pf_conductor: Any = None @@ -99,7 +99,7 @@ class BurnParam(NamedTuple): TohswgParam( t_current_ramp_up_min=0, vpfskv=0, - ncirt=8, + n_pf_cs_plasma_circuits=8, i_pf_conductor=0, nohc=7, powohres=0, @@ -657,7 +657,7 @@ class BurnParam(NamedTuple): TohswgParam( t_current_ramp_up_min=-526.67247746645455, vpfskv=20, - ncirt=8, + n_pf_cs_plasma_circuits=8, i_pf_conductor=0, nohc=7, powohres=0, @@ -1233,7 +1233,9 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): monkeypatch.setattr(pf_power_variables, "vpfskv", tohswgparam.vpfskv) - monkeypatch.setattr(pfcoil_variables, "ncirt", tohswgparam.ncirt) + monkeypatch.setattr( + pfcoil_variables, "n_pf_cs_plasma_circuits", tohswgparam.n_pf_cs_plasma_circuits + ) monkeypatch.setattr(pfcoil_variables, "i_pf_conductor", tohswgparam.i_pf_conductor) From 96cb161dc9031db057ea97ccc0c89f818e6ffb58 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 14:58:06 +0000 Subject: [PATCH 23/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'ncls'=20to=20'n?= =?UTF-8?q?=5Fpf=5Fcoils=5Fin=5Fgroup'=20across=20multiple=20files=20for?= =?UTF-8?q?=20consistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/pf-coil.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/large_tokamak_IN.DAT | 2 +- examples/data/scan_MFILE.DAT | 2 +- examples/data/scan_example_file_IN.DAT | 2 +- process/init.py | 8 +-- process/pfcoil.py | 70 +++++++++---------- process/power.py | 6 +- process/sctfcoil.py | 6 +- process/utilities/errorlist.json | 4 +- source/fortran/input.f90 | 6 +- source/fortran/pfcoil_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- .../data/large_tokamak_once_through.IN.DAT | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 2 +- tests/integration/data/scan_MFILE.DAT | 2 +- .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 8 +-- tests/integration/test_pfcoil_int.py | 24 ++++--- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_power.py | 10 +-- tests/unit/test_sctfcoil.py | 8 +-- 38 files changed, 109 insertions(+), 99 deletions(-) diff --git a/documentation/proc-pages/eng-models/pf-coil.md b/documentation/proc-pages/eng-models/pf-coil.md index cedc103af5..e081e2c5ad 100644 --- a/documentation/proc-pages/eng-models/pf-coil.md +++ b/documentation/proc-pages/eng-models/pf-coil.md @@ -13,7 +13,7 @@ The PF coil locations are controlled using a set of switched stored in array `i_ Figure 1), and are calculated in routine `PFCOIL`. The coils are (usually) organised into groups containing two PF coils placed symmetrically above and below the midplane, and each group `j` has an element `i_pf_location(j)` assigned to it. Input parameter `n_pf_coil_groups` should be set to the number of groups, -and `ncls(j)` should be assigned the number of coils in each group - which should be 2 in each case. +and `n_pf_coils_in_group(j)` should be assigned the number of coils in each group - which should be 2 in each case.
      ![Machine build](../images/vertical-build.png){ width="100%"} diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 2e9d08c144..4f896fd83a 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -1743,7 +1743,7 @@ i_pf_location = 2,2,3,3 i_pf_superconductor = 3 * Number of pf coils in group j -ncls = 1,1,2,2 +n_pf_coils_in_group = 1,1,2,2 * Number of groups of PF coils n_pf_coil_groups = 4 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index e34258c0e4..72097cb3b2 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -1737,7 +1737,7 @@ i_pf_location = 2,2,3,3 i_pf_superconductor = 3 * Number of pf coils in group j -ncls = 1,1,2,2 +n_pf_coils_in_group = 1,1,2,2 * Number of groups of PF coils n_pf_coil_groups = 4 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 76a34af564..61c6ee30af 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -1737,7 +1737,7 @@ i_pf_location = 2,2,3,3 i_pf_superconductor = 3 * Number of pf coils in group j -ncls = 1,1,2,2 +n_pf_coils_in_group = 1,1,2,2 * Number of groups of PF coils n_pf_coil_groups = 4 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index e9247edffb..29826607d4 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -1738,7 +1738,7 @@ i_pf_location = 2,2,3,3 i_pf_superconductor = 3 * Number of pf coils in group j -ncls = 1,1,2,2 +n_pf_coils_in_group = 1,1,2,2 * Number of groups of PF coils n_pf_coil_groups = 4 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index ac5aa37f8d..9a94aa3d99 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -1738,7 +1738,7 @@ i_pf_location = 2,2,3,3 i_pf_superconductor = 3 * Number of pf coils in group j -ncls = 1,1,2,2 +n_pf_coils_in_group = 1,1,2,2 * Number of groups of PF coils n_pf_coil_groups = 4 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index a69f1979c5..bc76ea2fa6 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -548,7 +548,7 @@ i_pf_location = 2,2,3,3 i_pf_superconductor = 3 * Number of pf coils in group j -ncls = 1,1,2,2 +n_pf_coils_in_group = 1,1,2,2 * Number of groups of PF coils n_pf_coil_groups = 4 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 1063a815be..229d83ab74 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -9207,7 +9207,7 @@ cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak c fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; -ncls = 1,1,2,2, * Number of pf coils in group j +n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j n_pf_coil_groups = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index a40b5aa98f..21f13ac777 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -548,7 +548,7 @@ i_pf_location = 2,2,3,3 i_pf_superconductor = 3 * Number of pf coils in group j -ncls = 1,1,2,2 +n_pf_coils_in_group = 1,1,2,2 * Number of groups of PF coils n_pf_coil_groups = 4 diff --git a/process/init.py b/process/init.py index 445fae7186..25b559c673 100644 --- a/process/init.py +++ b/process/init.py @@ -824,15 +824,15 @@ def check_process(): for i in range(fortran.pfcoil_variables.n_pf_coil_groups): if ( fortran.pfcoil_variables.i_pf_location[i] != 2 - and fortran.pfcoil_variables.ncls[i] != 2 + and fortran.pfcoil_variables.n_pf_coils_in_group[i] != 2 ): raise ProcessValidationError( - "ncls(i) .ne. 2 is not a valid option except for (i_pf_location = 2)" + "n_pf_coils_in_group(i) .ne. 2 is not a valid option except for (i_pf_location = 2)" ) if fortran.pfcoil_variables.i_pf_location[i] == 2: j = j + 1 - k = k + fortran.pfcoil_variables.ncls[i] + k = k + fortran.pfcoil_variables.n_pf_coils_in_group[i] if k == 1: raise ProcessValidationError( @@ -844,7 +844,7 @@ def check_process(): ) if fortran.physics_variables.i_single_null == 1 and j < 2: raise ProcessValidationError( - "If i_single_null=1, use 2 individual divertor coils (i_pf_location = 2, 2; ncls = 1, 1)" + "If i_single_null=1, use 2 individual divertor coils (i_pf_location = 2, 2; n_pf_coils_in_group = 1, 1)" ) # Constraint 10 is dedicated to ST designs with demountable joints diff --git a/process/pfcoil.py b/process/pfcoil.py index c663f460a7..375a01ee34 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -97,18 +97,18 @@ def pfcoil(self): # exceeds the limit pfv.nohc = 0 for i in range(pfv.n_pf_coil_groups): - if pfv.ncls[i] > pfv.nclsmx: + if pfv.n_pf_coils_in_group[i] > pfv.nclsmx: eh.idiags[0] = i - eh.idiags[1] = pfv.ncls[i] + eh.idiags[1] = pfv.n_pf_coils_in_group[i] eh.idiags[2] = pfv.nclsmx eh.report_error(65) - pfv.nohc = pfv.nohc + pfv.ncls[i] + pfv.nohc = pfv.nohc + pfv.n_pf_coils_in_group[i] # Add one if an Central Solenoid is present, and make an extra group if bv.iohcl != 0: pfv.nohc = pfv.nohc + 1 - pfv.ncls[pfv.n_pf_coil_groups] = 1 + pfv.n_pf_coils_in_group[pfv.n_pf_coil_groups] = 1 # Add one for the plasma pfv.n_pf_cs_plasma_circuits = pfv.nohc + 1 @@ -163,11 +163,11 @@ def pfcoil(self): # Place the PF coils: - # N.B. Problems here if k=ncls(group) is greater than 2. + # N.B. Problems here if k=n_pf_coils_in_group(group) is greater than 2. for j in range(pfv.n_pf_coil_groups): if pfv.i_pf_location[j] == 1: # PF coil is stacked on top of the Central Solenoid - for k in range(pfv.ncls[j]): + for k in range(pfv.n_pf_coils_in_group[j]): pf.rcls[j, k] = pfv.r_cs_middle + pfv.rpf1 # Z coordinate of coil enforced so as not @@ -181,7 +181,7 @@ def pfcoil(self): elif pfv.i_pf_location[j] == 2: # PF coil is on top of the TF coil - for k in range(pfv.ncls[j]): + for k in range(pfv.n_pf_coils_in_group[j]): pf.rcls[j, k] = pv.rmajor + pfv.rpf2 * pv.triang * pv.rminor if pv.itart == 1 and pv.itartpf == 0: pf.zcls[j, k] = (bv.hmax - pfv.zref[j]) * signn[k] @@ -198,7 +198,7 @@ def pfcoil(self): elif pfv.i_pf_location[j] == 3: # PF coil is radially outside the TF coil - for k in range(pfv.ncls[j]): + for k in range(pfv.n_pf_coils_in_group[j]): pf.zcls[j, k] = pv.rminor * pfv.zref[j] * signn[k] # Coil radius follows TF coil curve for SC TF (D-shape) # otherwise stacked for resistive TF (rectangle-shape) @@ -218,7 +218,7 @@ def pfcoil(self): # PF coil is in general location # See issue 1418 # https://git.ccfe.ac.uk/process/process/-/issues/1418 - for k in range(pfv.ncls[j]): + for k in range(pfv.n_pf_coils_in_group[j]): pf.zcls[j, k] = pv.rminor * pfv.zref[j] * signn[k] pf.rcls[j, k] = pv.rminor * pfv.rref[j] + pv.rmajor @@ -267,7 +267,7 @@ def pfcoil(self): pf.zfxf, pf.cfxf, pfv.n_pf_coil_groups, - pfv.ncls, + pfv.n_pf_coils_in_group, pf.rcls, pf.zcls, pfv.alfapf, @@ -328,8 +328,8 @@ def pfcoil(self): # This coil is to balance Central Solenoid flux and should not be involved # in equilibrium calculation -- RK 07/12 pf.ccls[i] = 0.0e0 - nfxf0 = nfxf0 + pfv.ncls[i] - for ccount in range(pfv.ncls[i]): + nfxf0 = nfxf0 + pfv.n_pf_coils_in_group[i] + for ccount in range(pfv.n_pf_coils_in_group[i]): pf.rfxf[nocoil] = pf.rcls[i, ccount] pf.zfxf[nocoil] = pf.zcls[i, ccount] pf.cfxf[nocoil] = pf.ccls[i] @@ -344,8 +344,8 @@ def pfcoil(self): * 2.0e0 * (1.0e0 - (pv.kappa * pv.rminor) / abs(pf.zcls[i, 0])) ) - nfxf0 = nfxf0 + pfv.ncls[i] - for ccount in range(pfv.ncls[i]): + nfxf0 = nfxf0 + pfv.n_pf_coils_in_group[i] + for ccount in range(pfv.n_pf_coils_in_group[i]): pf.rfxf[nocoil] = pf.rcls[i, ccount] pf.zfxf[nocoil] = pf.zcls[i, ccount] pf.cfxf[nocoil] = pf.ccls[i] @@ -436,7 +436,7 @@ def pfcoil(self): pfflux = 0.0e0 nocoil = 0 for ccount in range(pfv.n_pf_coil_groups): - for _i in range(pfv.ncls[ccount]): + for _i in range(pfv.n_pf_coils_in_group[ccount]): pfflux = pfflux + ( pf.ccls[ccount] * pfv.sxlg[nocoil, pfv.n_pf_cs_plasma_circuits - 1] @@ -479,7 +479,7 @@ def pfcoil(self): # Split groups of coils into one set containing ncl coils ncl = 0 for nng in range(pfv.n_pf_coil_groups): - for ng2 in range(pfv.ncls[nng]): + for ng2 in range(pfv.n_pf_coils_in_group[nng]): pfv.r_pf_coil_middle[ncl] = pf.rcls[nng, ng2] pfv.z_pf_coil_middle[ncl] = pf.zcls[nng, ng2] @@ -529,7 +529,7 @@ def pfcoil(self): dz = 0 for ii in range(pfv.n_pf_coil_groups): - for _ij in range(pfv.ncls[ii]): + for _ij in range(pfv.n_pf_coils_in_group[ii]): if pfv.i_pf_location[ii] == 1: # PF coil is stacked on top of the Central Solenoid dx = 0.5e0 * bv.dr_cs @@ -600,7 +600,7 @@ def pfcoil(self): for ii in range(pfv.n_pf_coil_groups): iii = ii - for ij in range(pfv.ncls[ii]): + for ij in range(pfv.n_pf_coils_in_group[ii]): # Peak field if ij == 0: @@ -737,7 +737,7 @@ def pfcoil(self): c = 0 pfv.itr_sum = 0.0e0 for m in range(pfv.n_pf_coil_groups): - for _n in range(pfv.ncls[m]): + for _n in range(pfv.n_pf_coils_in_group[m]): pfv.itr_sum = pfv.itr_sum + ( pfv.r_pf_coil_middle[c] * pfv.n_pf_coil_turns[c] * pfv.cptdin[c] ) @@ -802,7 +802,7 @@ def efc( zfix, cfix, n_pf_coil_groups, - ncls, + n_pf_coils_in_group, rcls, zcls, alfa, @@ -843,8 +843,8 @@ def efc( :param n_pf_coil_groups: number of coil groups, where all coils in a group have the same current, <= n_pf_groups_max :type n_pf_coil_groups: int - :param ncls: number of coils in each group, each value <= nclsmx - :type ncls: np.ndarray + :param n_pf_coils_in_group: number of coils in each group, each value <= nclsmx + :type n_pf_coils_in_group: np.ndarray :param rcls: coords R(i,j), Z(i,j) of coil j in group i (m) :type rcls: np.ndarray :param zcls: coords R(i,j), Z(i,j) of coil j in group i (m) @@ -892,7 +892,7 @@ def efc( brin, bzin, int(n_pf_coil_groups), - ncls, + n_pf_coils_in_group, rcls, zcls, alfa, @@ -922,7 +922,7 @@ def tf_pf_collision_detector(self): for i in range(pfv.n_pf_coil_groups): for ii in range(pfv.n_pf_coil_groups): - for ij in range(pfv.ncls[ii]): + for ij in range(pfv.n_pf_coils_in_group[ii]): if pf.rcls[ii, ij] <= ( # Outboard TF coil collision pf.rclsnorm - pfv.routr + pfv.r_pf_coil_middle[i] ) and pf.rcls[ii, ij] >= ( @@ -1319,7 +1319,7 @@ def peakb(self, i, ii, it): # Non-Central Solenoid coils' contributions jj = 0 for iii in range(pfv.n_pf_coil_groups): - for _jjj in range(pfv.ncls[iii]): + for _jjj in range(pfv.n_pf_coils_in_group[iii]): jj = jj + 1 # Radius, z-coordinate and current for each coil if iii == ii - 1: @@ -1390,7 +1390,7 @@ def peakb(self, i, ii, it): bpfin = math.sqrt(bri**2 + bzi**2) bpfout = math.sqrt(bro**2 + bzo**2) - for n in range(pfv.ncls[ii - 1]): + for n in range(pfv.n_pf_coils_in_group[ii - 1]): pfv.bpf[i - 1 + n] = bpfin pf.bpf2[i - 1 + n] = bpfout @@ -1779,14 +1779,14 @@ def induct(self, output): for i in range(pfv.n_pf_coil_groups): xpfpl = 0.0 - ncoils = ncoils + pfv.ncls[i] + ncoils = ncoils + pfv.n_pf_coils_in_group[i] rp = pfv.r_pf_coil_middle[ncoils - 1] zp = pfv.z_pf_coil_middle[ncoils - 1] xc, br, bz, psi = bfield(rc, zc, cc, rp, zp) for ii in range(nplas): xpfpl = xpfpl + xc[ii] - for j in range(pfv.ncls[i]): + for j in range(pfv.n_pf_coils_in_group[i]): ncoilj = ncoils + 1 - (j + 1) pfv.sxlg[ncoilj - 1, pfv.n_pf_cs_plasma_circuits - 1] = ( xpfpl / nplas * pfv.n_pf_coil_turns[ncoilj - 1] @@ -1814,14 +1814,14 @@ def induct(self, output): ncoils = 0 for i in range(pfv.n_pf_coil_groups): xohpf = 0.0 - ncoils = ncoils + pfv.ncls[i] + ncoils = ncoils + pfv.n_pf_coils_in_group[i] rp = pfv.r_pf_coil_middle[ncoils - 1] zp = pfv.z_pf_coil_middle[ncoils - 1] xc, br, bz, psi = bfield(rc, zc, cc, rp, zp) for ii in range(noh): xohpf = xohpf + xc[ii] - for j in range(pfv.ncls[i]): + for j in range(pfv.n_pf_coils_in_group[i]): ncoilj = ncoils + 1 - (j + 1) pfv.sxlg[ncoilj - 1, pfv.nohc - 1] = ( xohpf @@ -3231,7 +3231,7 @@ def mtrx( brin, bzin, n_pf_coil_groups, - ncls, + n_pf_coils_in_group, rcls, zcls, alfa, @@ -3266,8 +3266,8 @@ def mtrx( :param n_pf_coil_groups: number of coil groups, where all coils in a group have the same current, <= n_pf_groups_max :type n_pf_coil_groups: int - :param ncls: number of coils in each group, each value <= nclsmx - :type ncls: numpy.ndarray + :param n_pf_coils_in_group: number of coils in each group, each value <= nclsmx + :type n_pf_coils_in_group: numpy.ndarray :param rcls: coords R(i,j), Z(i,j) of coil j in group i (m) :type rcls: numpy.ndarray :param zcls: coords R(i,j), Z(i,j) of coil j in group i (m) @@ -3292,7 +3292,7 @@ def mtrx( bvec[i + npts] = bzin[i] - bfix[i + npts] for j in range(n_pf_coil_groups): - nc = ncls[j] + nc = n_pf_coils_in_group[j] _, gmat[i, j], gmat[i + npts, j], _ = bfield( rcls[j, :nc], zcls[j, :nc], cc[:nc], rpts[i], zpts[i] @@ -3304,7 +3304,7 @@ def mtrx( bvec[nrws : nrws + n_pf_coil_groups] = 0.0 np.fill_diagonal( gmat[nrws : nrws + n_pf_coil_groups, :n_pf_coil_groups], - ncls[:n_pf_coil_groups] * alfa, + n_pf_coils_in_group[:n_pf_coil_groups] * alfa, ) nrws = 2 * npts + n_pf_coil_groups diff --git a/process/power.py b/process/power.py index a0679535f7..5cad6f8419 100644 --- a/process/power.py +++ b/process/power.py @@ -100,7 +100,7 @@ def pfpwr(self, output: bool): pfbuspwr = 0.0e0 for ig in range(ngrpt): - ic = ic + pfcoil_variables.ncls[ig] + ic = ic + pfcoil_variables.n_pf_coils_in_group[ig] # Section area of aluminium bussing for circuit (cm**2) # pfcoil_variables.cptdin : max current per turn of coil (A) @@ -128,7 +128,7 @@ def pfpwr(self, output: bool): ) ) * pfcoil_variables.n_pf_coil_turns[ic] ** 2 - * pfcoil_variables.ncls[ig] + * pfcoil_variables.n_pf_coils_in_group[ig] ) cktr[ig] = pfcr[ig] + pfbusr[ig] # total resistance of circuit (ohms) @@ -164,7 +164,7 @@ def pfpwr(self, output: bool): poloidalenergy[:] = 0.0e0 for jjpf in range(ngrpt): # Loop over all groups of PF coils. for _jjpf2 in range( - pfcoil_variables.ncls[jjpf] + pfcoil_variables.n_pf_coils_in_group[jjpf] ): # Loop over all coils in each group jpf = jpf + 1 inductxcurrent[:] = 0.0e0 diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 4f3235125a..0b26f099ff 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1275,7 +1275,7 @@ def sctfcoil(self, output: bool): pfcoil_variables.coheof, pfcoil_variables.cohbop, pfcoil_variables.cptdin, - pfcoil_variables.ncls, + pfcoil_variables.n_pf_coils_in_group, pfcoil_variables.ld_ratio_cst, pfcoil_variables.r_out_cst, pfcoil_variables.oh_steel_frac, @@ -3590,7 +3590,7 @@ def stresscl( coheof, cohbop, cptdin, - ncls, + n_pf_coils_in_group, ld_ratio_cst, r_out_cst, oh_steel_frac, @@ -3788,7 +3788,7 @@ def stresscl( curr_oh_max = 1.0e-6 * np.maximum(coheof, cohbop) * a_oh # Number of turns - n_oh_turns = 1.0e6 * curr_oh_max / cptdin[sum(ncls)] + n_oh_turns = 1.0e6 * curr_oh_max / cptdin[sum(n_pf_coils_in_group)] # CS Turn vertical cross-sectionnal area a_oh_turn = a_oh / n_oh_turns diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index 9d037bfc17..2dd809addb 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -213,7 +213,7 @@ { "no": 41, "level": 3, - "message": "CHECK: ncls(i) .ne. 2 is not a valid option except for (i_pf_location = 2)" + "message": "CHECK: n_pf_coils_in_group(i) .ne. 2 is not a valid option except for (i_pf_location = 2)" }, { "no": 42, @@ -228,7 +228,7 @@ { "no": 44, "level": 3, - "message": "CHECK: If i_single_null=1, use 2 individual divertor coils (i_pf_location = 2, 2; ncls = 1, 1)" + "message": "CHECK: If i_single_null=1, use 2 individual divertor coils (i_pf_location = 2, 2; n_pf_coils_in_group = 1, 1)" }, { "no": 45, diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 85eff55239..64fe7fafa0 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -299,7 +299,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) coheof, sigpfcalw, alstroh, i_pf_conductor, fcupfsu, fvssu, etapsu, i_cs_stress, & fbmaxcs, ngc, rpf2, fcohbop, ohhghf, vfohc, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & n_pf_coil_groups, i_pf_superconductor, nfxfh, alfapf, routr, sigpfcf, rho_pf_coil, bmaxcs_lim, & - ncls, nfixmx, cptdin, i_pf_location, i_sup_pf_shape, rref, i_pf_current, & + n_pf_coils_in_group, nfixmx, cptdin, i_pf_location, i_sup_pf_shape, rref, i_pf_current, & ccl0_ma, ccls_ma, ld_ratio_cst use physics_variables, only: ipedestal, taumax, i_single_null, fvsbrnni, & rhopedt, f_vol_plasma, f_deuterium, ffwal, i_beta_component, itartpf, i_l_h_threshold, & @@ -1870,8 +1870,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('i_sup_pf_shape') call parse_int_variable('i_sup_pf_shape', i_sup_pf_shape, 0, 1, & 'Switch to place outboard PF coils when TF superconducting') - case ('ncls') - call parse_int_array('ncls', ncls, isub1, n_pf_groups_max+2, & + case ('n_pf_coils_in_group') + call parse_int_array('n_pf_coils_in_group', n_pf_coils_in_group, isub1, n_pf_groups_max+2, & 'No of coils in PF group', icode) case ('nfxfh') call parse_int_variable('nfxfh', nfxfh, 1, nfixmx/2, & diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index a535a8271f..c59e334e2d 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -201,7 +201,7 @@ module pfcoil_variables integer :: n_pf_cs_plasma_circuits !! number of PF circuits (including central solenoid and plasma) - integer, dimension(n_pf_groups_max+2) :: ncls + integer, dimension(n_pf_groups_max+2) :: n_pf_coils_in_group !! number of PF coils in group j integer :: nfxfh @@ -457,7 +457,7 @@ subroutine init_pfcoil_variables jcableoh_bop = 0.0D0 jcableoh_eof = 0.0D0 n_pf_cs_plasma_circuits = 0 - ncls = (/1,1,2,0,0,0,0,0,0,0,0,0/) + n_pf_coils_in_group = (/1,1,2,0,0,0,0,0,0,0,0,0/) nfxfh = 7 n_pf_coil_groups = 3 nohc = 0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index e0ac3ede91..b790b42769 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -1736,7 +1736,7 @@ i_pf_location = 2,2,3,3 i_pf_superconductor = 3 * Number of pf coils in group j -ncls = 1,1,2,2 +n_pf_coils_in_group = 1,1,2,2 * Number of groups of PF coils n_pf_coil_groups = 4 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 8488d93cd3..92244a238f 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -1737,7 +1737,7 @@ i_pf_location = 2,2,3,3 i_pf_superconductor = 3 * Number of pf coils in group j -ncls = 1,1,2,2 +n_pf_coils_in_group = 1,1,2,2 * Number of groups of PF coils n_pf_coil_groups = 4 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 0459bc6c69..098a008780 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -1737,7 +1737,7 @@ i_pf_location = 2,2,3,3 i_pf_superconductor = 3 * Number of pf coils in group j -ncls = 1,1,2,2 +n_pf_coils_in_group = 1,1,2,2 * Number of groups of PF coils n_pf_coil_groups = 4 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 2733ba7e10..b6f8b1a992 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -1737,7 +1737,7 @@ i_pf_location = 2,2,3,3 i_pf_superconductor = 3 * Number of pf coils in group j -ncls = 1,1,2,2 +n_pf_coils_in_group = 1,1,2,2 * Number of groups of PF coils n_pf_coil_groups = 4 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 6c8e8d14f2..a55fa7aecd 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -547,7 +547,7 @@ i_pf_location = 2,2,3,3 i_pf_superconductor = 3 * Number of pf coils in group j -ncls = 1,1,2,2 +n_pf_coils_in_group = 1,1,2,2 * Number of groups of PF coils n_pf_coil_groups = 4 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index b417c342f4..b3eb439d3a 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -1738,7 +1738,7 @@ i_pf_location = 2,2,3,3 i_pf_superconductor = 3 * Number of pf coils in group j -ncls = 1,1,2,2 +n_pf_coils_in_group = 1,1,2,2 * Number of groups of PF coils n_pf_coil_groups = 4 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 1e35868a59..ea7e98b14b 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -286,7 +286,7 @@ fcuohsu = 0.70 * copper fraction of strand in central solenoid i_pf_location = 2,2,3,3 * Switch for location of PF coil group i; i_cs_superconductor = 1 * switch for superconductor material in central solenoid; i_pf_superconductor = 3 * switch for superconductor material in PF coils; -ncls = 1,1,2,2 * number of PF coils in group j +n_pf_coils_in_group = 1,1,2,2 * number of PF coils in group j n_pf_coil_groups = 4 * number of groups of PF coils; Symmetric coil pairs should all be in the same group ohhghf = 0.9 * Central solenoid height / TF coil internal height oh_steel_frac = 0.4856940627014451 * central solenoid steel fraction (`iteration variable 122`) diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 640a7b49ce..6222785002 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -228,7 +228,7 @@ cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak c fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; -ncls = 1,1,2,2, * Number of pf coils in group j +n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j n_pf_coil_groups = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index a0857de79e..f0641fa030 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -18024,7 +18024,7 @@ i_pf_location = 2,2,3,3 i_pf_superconductor = 3 * Number of pf coils in group j -ncls = 1,1,2,2 +n_pf_coils_in_group = 1,1,2,2 * Number of groups of PF coils n_pf_coil_groups = 4 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index bb0c5083df..df45065057 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -9207,7 +9207,7 @@ cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak c fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; -ncls = 1,1,2,2, * Number of pf coils in group j +n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j n_pf_coil_groups = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 20cf2c6420..f327ee1a6c 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -228,7 +228,7 @@ cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak c fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; -ncls = 1,1,2,2, * Number of pf coils in group j +n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j n_pf_coil_groups = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index d28a529c65..da2405226c 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -228,7 +228,7 @@ cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak c fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; -ncls = 1,1,2,2, * Number of pf coils in group j +n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j n_pf_coil_groups = 4 * Number of groups of pf coils; ohhghf = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 1d94be5a75..6afae6437f 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3360,7 +3360,7 @@ "nbshinemw": 0.0, "ncalls": 0.0, "n_pf_cs_plasma_circuits": 0.0, - "ncls": [ + "n_pf_coils_in_group": [ 1.0, 1.0, 2.0, @@ -10133,7 +10133,7 @@ "nbshinemw": "neutral beam shine-through power", "ncalls": "ncalls : number of function calls during solution", "n_pf_cs_plasma_circuits": "number of PF circuits (including central solenoid and plasma)", - "ncls": "number of PF coils in group j", + "n_pf_coils_in_group": "number of PF coils in group j", "nclsmx": "maximum number of PF coils in a given group", "ncool": "number of centrepost coolant tubes", "ne0": "central electron density (/m3)", @@ -18960,7 +18960,7 @@ "jcableoh_bop", "jcableoh_eof", "n_pf_cs_plasma_circuits", - "ncls", + "n_pf_coils_in_group", "nfxfh", "n_pf_coil_groups", "nohc", @@ -20562,7 +20562,7 @@ "nblktmodto": "int_variable", "nbshield": "real_variable", "nbshinefmax": "real_variable", - "ncls": "int_array", + "n_pf_coils_in_group": "int_array", "neped": "real_variable", "neqns": "int_variable", "neratio": "real_variable", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index ccf4676ea2..4fd1e76a62 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -65,7 +65,9 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "rjconpf", np.full(22, 1.1e7)) monkeypatch.setattr(pfv, "n_pf_coil_groups", 4) monkeypatch.setattr(pfv, "r_cs_middle", 3.0) - monkeypatch.setattr(pfv, "ncls", np.array([1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0])) + monkeypatch.setattr( + pfv, "n_pf_coils_in_group", np.array([1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0]) + ) monkeypatch.setattr(pfv, "z_pf_coil_middle", np.full(22, 0.0)) monkeypatch.setattr(pfv, "cptdin", np.full(22, 4.22e4)) monkeypatch.setattr(pfv, "pfcaseth", np.full(22, 0.0)) @@ -245,7 +247,9 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(bv, "iohcl", 1) monkeypatch.setattr(pfv, "waves", np.full([22, 6], 0.0)) monkeypatch.setattr(pfv, "n_pf_coil_groups", 4) - monkeypatch.setattr(pfv, "ncls", np.array([1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0])) + monkeypatch.setattr( + pfv, "n_pf_coils_in_group", np.array([1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0]) + ) monkeypatch.setattr(pfv, "curpfb", np.full(22, 0.0)) monkeypatch.setattr(pfv, "curpff", np.full(22, 0.0)) monkeypatch.setattr(pfv, "curpfs", np.full(22, -175.84911993600002)) @@ -346,7 +350,7 @@ def test_efc(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): cfix = np.full(nfixmx, 0.0) cfix[0:14] = 12547065.315963898 n_pf_coil_groups = 4 - ncls = np.array([1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0]) + n_pf_coils_in_group = np.array([1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0]) # This 2D array argument discovered via gdb prints as a 1D array, therefore # needs to be reshaped into its original 2D. Fortran ordering is essential @@ -427,7 +431,7 @@ def test_efc(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): zfix, cfix, n_pf_coil_groups, - ncls, + n_pf_coils_in_group, rcls, zcls, alfa, @@ -499,7 +503,7 @@ def test_mtrx(pfcoil: PFCoil): brin = np.zeros(nptsmx) bzin = np.zeros(nptsmx) n_pf_coil_groups = 4 - ncls = np.array([1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0]) + n_pf_coils_in_group = np.array([1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0]) rcls = np.reshape( [ 0, @@ -639,7 +643,7 @@ def test_mtrx(pfcoil: PFCoil): brin, bzin, n_pf_coil_groups, - ncls, + n_pf_coils_in_group, rcls, zcls, alfa, @@ -2391,7 +2395,9 @@ def test_peakb(monkeypatch: pytest.MonkeyPatch, pfcoil: PFCoil): 0, ]), ) - monkeypatch.setattr(pfv, "ncls", np.array([1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0])) + monkeypatch.setattr( + pfv, "n_pf_coils_in_group", np.array([1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0]) + ) monkeypatch.setattr( pfv, "z_pf_coil_lower", @@ -2864,7 +2870,9 @@ def test_induct(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): monkeypatch.setattr(pfv, "sxlg", np.ones((22, 22), dtype=int)) monkeypatch.setattr(pfv, "r_cs_middle", 2.6084100000000001) monkeypatch.setattr(pfv, "n_pf_coil_groups", 4) - monkeypatch.setattr(pfv, "ncls", np.array([1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0])) + monkeypatch.setattr( + pfv, "n_pf_coils_in_group", np.array([1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0]) + ) monkeypatch.setattr( pfv, "z_pf_coil_lower", diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index a0ff67f1d2..df6b9a1543 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -547,7 +547,7 @@ i_pf_location = 2,2,3,3 i_pf_superconductor = 3 * Number of pf coils in group j -ncls = 1,1,2,2 +n_pf_coils_in_group = 1,1,2,2 * Number of groups of PF coils n_pf_coil_groups = 4 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 80efad46e6..26c3423e11 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -529,7 +529,7 @@ i_pf_location = 2,2,3,3 i_pf_superconductor = 3 * Number of pf coils in group j -ncls = 1,1,2,2 +n_pf_coils_in_group = 1,1,2,2 * Number of groups of PF coils n_pf_coil_groups = 4 diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index 6725dabeb8..4592c471c2 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -286,7 +286,7 @@ fcuohsu = 0.70 * copper fraction of strand in central solenoid i_pf_location = 2,2,3,3 * Switch for location of PF coil group i; i_cs_superconductor = 1 * switch for superconductor material in central solenoid; i_pf_superconductor = 3 * switch for superconductor material in PF coils; -ncls = 1,1,2,2 * number of PF coils in group j +n_pf_coils_in_group = 1,1,2,2 * number of PF coils in group j n_pf_coil_groups = 4 * number of groups of PF coils; Symmetric coil pairs should all be in the same group ohhghf = 0.9 * Central solenoid height / TF coil internal height oh_steel_frac = 0.4856940627014451 * central solenoid steel fraction (`iteration variable 122`) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 982d580e06..f7c82b4d38 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1942,7 +1942,7 @@ i_sup_pf_shape = 1 *rmajor (offset = rpf2*triang*rminor) * JUSTIFICATION: Not used, no i_pf_location = 2 coils -ncls = 2,2,2,2 +n_pf_coils_in_group = 2,2,2,2 * DESCRIPTION: Number of PF Coils in Group j * JUSTIFICATION: Design choice, symmetric top and bottom diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 12ce7dd74a..7e2bcb3a70 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -548,7 +548,7 @@ i_pf_location = 2,2,3,3 i_pf_superconductor = 3 * Number of pf coils in group j -ncls = 1,1,2,2 +n_pf_coils_in_group = 1,1,2,2 * Number of groups of PF coils n_pf_coil_groups = 4 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 2966dcb1d1..7ed58de99a 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -1739,7 +1739,7 @@ i_pf_location = 2,2,3,3 i_pf_superconductor = 3 * Number of pf coils in group j -ncls = 1,1,2,2 +n_pf_coils_in_group = 1,1,2,2 * Number of groups of PF coils n_pf_coil_groups = 4 diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index a25aabd1a0..9541b5f29b 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -201,7 +201,7 @@ class PfpwrParam(NamedTuple): n_pf_cs_plasma_circuits: Any = None - ncls: Any = None + n_pf_coils_in_group: Any = None ric: Any = None @@ -433,7 +433,7 @@ class PfpwrParam(NamedTuple): pfwpmw=0, rho_pf_coil=0, n_pf_cs_plasma_circuits=8, - ncls=np.array( + n_pf_coils_in_group=np.array( np.array((1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0), order="F"), order="F" ).transpose(), ric=np.array( @@ -1176,7 +1176,7 @@ class PfpwrParam(NamedTuple): pfwpmw=0.89998039031509891, rho_pf_coil=0, n_pf_cs_plasma_circuits=8, - ncls=np.array( + n_pf_coils_in_group=np.array( np.array((1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0), order="F"), order="F" ).transpose(), ric=np.array( @@ -1810,7 +1810,9 @@ def test_pfpwr(pfpwrparam, monkeypatch, power): pfcoil_variables, "n_pf_cs_plasma_circuits", pfpwrparam.n_pf_cs_plasma_circuits ) - monkeypatch.setattr(pfcoil_variables, "ncls", pfpwrparam.ncls) + monkeypatch.setattr( + pfcoil_variables, "n_pf_coils_in_group", pfpwrparam.n_pf_coils_in_group + ) monkeypatch.setattr(pfcoil_variables, "ric", pfpwrparam.ric) diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 2d08a33c71..8b580bd6dd 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -3581,7 +3581,7 @@ class StressclParam(NamedTuple): cohbop: Any = None - ncls: Any = None + n_pf_coils_in_group: Any = None cptdin: Any = None @@ -3702,7 +3702,7 @@ class StressclParam(NamedTuple): ohhghf=0.90000000000000002, coheof=20726000, cohbop=0, - ncls=np.array( + n_pf_coils_in_group=np.array( np.array((1, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0), order="F"), order="F" ).transpose(), cptdin=np.array( @@ -3825,7 +3825,7 @@ class StressclParam(NamedTuple): ohhghf=0.90000000000000002, coheof=20726000, cohbop=19311657.760000002, - ncls=np.array( + n_pf_coils_in_group=np.array( np.array((1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0), order="F"), order="F" ).transpose(), cptdin=np.array( @@ -3950,7 +3950,7 @@ def test_stresscl(stressclparam, monkeypatch, sctfcoil): stressclparam.coheof, stressclparam.cohbop, stressclparam.cptdin, - stressclparam.ncls, + stressclparam.n_pf_coils_in_group, 70 / 22, 3e-3, stressclparam.oh_steel_frac, From 78c20a097d43bb3d75d31a3894f96c2169252b45 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 15:01:33 +0000 Subject: [PATCH 24/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'nohc'=20to=20'n?= =?UTF-8?q?=5Fcs=5Fpf=5Fcoils'=20across=20multiple=20files=20for=20consist?= =?UTF-8?q?ency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 10 +- examples/data/large_tokamak_1_MFILE.DAT | 10 +- examples/data/large_tokamak_2_MFILE.DAT | 10 +- examples/data/large_tokamak_3_MFILE.DAT | 10 +- examples/data/large_tokamak_4_MFILE.DAT | 10 +- examples/data/scan_MFILE.DAT | 90 +++---- process/costs.py | 22 +- process/pfcoil.py | 225 ++++++++++-------- process/pulse.py | 21 +- source/fortran/pfcoil_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 10 +- .../data/large_tokamak_2_MFILE.DAT | 10 +- .../data/large_tokamak_3_MFILE.DAT | 10 +- .../data/large_tokamak_4_MFILE.DAT | 10 +- .../integration/data/large_tokamak_MFILE.DAT | 10 +- tests/integration/data/scan_2D_MFILE.DAT | 150 ++++++------ tests/integration/data/scan_MFILE.DAT | 90 +++---- tests/integration/ref_dicts.json | 6 +- tests/integration/test_pfcoil_int.py | 10 +- tests/unit/data/large_tokamak_MFILE.DAT | 10 +- tests/unit/test_costs_1990.py | 10 +- tests/unit/test_pfcoil.py | 6 +- tests/unit/test_pulse.py | 8 +- 23 files changed, 392 insertions(+), 360 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 4f896fd83a..244c0f9022 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -863,13 +863,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3097E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2388E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5758E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3365E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3365E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5551E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.4232E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.7693E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.3997E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.4232E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.7693E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.3997E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8915E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 72097cb3b2..79f38191d8 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -858,13 +858,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2734E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6308E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8523E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4050E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6308E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8523E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 61c6ee30af..754f12d151 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -858,13 +858,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2734E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6308E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8523E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4050E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6308E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8523E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 29826607d4..efd04e4cb6 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -858,13 +858,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2734E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6308E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8523E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4050E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6308E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8523E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 9a94aa3d99..82cb4dc169 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -858,13 +858,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2734E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6308E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8523E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4050E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6308E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8523E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 229d83ab74..15332a83d3 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -694,13 +694,13 @@ PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 - Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 + Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 + Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -1689,13 +1689,13 @@ PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 - Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 + Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 + Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -2684,13 +2684,13 @@ PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 - Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 + Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 + Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -3679,13 +3679,13 @@ PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 - Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 + Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 + Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -4674,13 +4674,13 @@ PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 - Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 + Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 + Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -5669,13 +5669,13 @@ PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 - Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 + Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 + Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -6664,13 +6664,13 @@ PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 - Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 + Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 + Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -7659,13 +7659,13 @@ PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 - Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 + Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 + Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -8654,13 +8654,13 @@ PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 - Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 + Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 + Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/process/costs.py b/process/costs.py index d8f1f3b988..dffa711f15 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1553,7 +1553,7 @@ def acc2222(self): # Total length of PF coil windings (m) pfwndl = 0.0e0 - for i in range(pfcoil_variables.nohc): + for i in range(pfcoil_variables.n_cs_pf_coils): pfwndl = ( pfwndl + constants.twopi @@ -1574,9 +1574,9 @@ def acc2222(self): # Non-Central Solenoid coils if build_variables.iohcl == 1: - npf = pfcoil_variables.nohc - 1 + npf = pfcoil_variables.n_cs_pf_coils - 1 else: - npf = pfcoil_variables.nohc + npf = pfcoil_variables.n_cs_pf_coils self.c22221 = 0.0e0 @@ -1665,7 +1665,9 @@ def acc2222(self): * pfcoil_variables.awpoh * (1 - pfcoil_variables.vfohc) * (1 - pfcoil_variables.fcuohsu) - / pfcoil_variables.n_pf_coil_turns[pfcoil_variables.nohc - 1] + / pfcoil_variables.n_pf_coil_turns[ + pfcoil_variables.n_cs_pf_coils - 1 + ] * tfcoil_variables.dcond[ pfcoil_variables.i_cs_superconductor - 1 ] @@ -1694,7 +1696,9 @@ def acc2222(self): * pfcoil_variables.awpoh * (1 - pfcoil_variables.vfohc) * pfcoil_variables.fcuohsu - / pfcoil_variables.n_pf_coil_turns[pfcoil_variables.nohc - 1] + / pfcoil_variables.n_pf_coil_turns[ + pfcoil_variables.n_cs_pf_coils - 1 + ] * constants.dcopper ) else: @@ -1703,7 +1707,9 @@ def acc2222(self): cost_variables.uccu * pfcoil_variables.awpoh * (1 - pfcoil_variables.vfohc) - / pfcoil_variables.n_pf_coil_turns[pfcoil_variables.nohc - 1] + / pfcoil_variables.n_pf_coil_turns[ + pfcoil_variables.n_cs_pf_coils - 1 + ] * constants.dcopper ) @@ -1720,8 +1726,8 @@ def acc2222(self): self.c22221 = self.c22221 + ( 1.0e-6 * constants.twopi - * pfcoil_variables.r_pf_coil_middle[pfcoil_variables.nohc - 1] - * pfcoil_variables.n_pf_coil_turns[pfcoil_variables.nohc - 1] + * pfcoil_variables.r_pf_coil_middle[pfcoil_variables.n_cs_pf_coils - 1] + * pfcoil_variables.n_pf_coil_turns[pfcoil_variables.n_cs_pf_coils - 1] * cpfconpm ) diff --git a/process/pfcoil.py b/process/pfcoil.py index 375a01ee34..627f5cd6e2 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -86,7 +86,7 @@ def pfcoil(self): # Toggle switch for i_pf_location()=2 coils above/below midplane top_bottom = 1 - # Set up the number of PF coils including the Central Solenoid (nohc), + # Set up the number of PF coils including the Central Solenoid (n_cs_pf_coils), # and the number of PF circuits including the plasma (n_pf_cs_plasma_circuits) if pfv.n_pf_coil_groups > pfv.n_pf_groups_max: eh.idiags[0] = pfv.n_pf_coil_groups @@ -95,7 +95,7 @@ def pfcoil(self): # Total the number of PF coils in all groups, and check that none # exceeds the limit - pfv.nohc = 0 + pfv.n_cs_pf_coils = 0 for i in range(pfv.n_pf_coil_groups): if pfv.n_pf_coils_in_group[i] > pfv.nclsmx: eh.idiags[0] = i @@ -103,15 +103,15 @@ def pfcoil(self): eh.idiags[2] = pfv.nclsmx eh.report_error(65) - pfv.nohc = pfv.nohc + pfv.n_pf_coils_in_group[i] + pfv.n_cs_pf_coils = pfv.n_cs_pf_coils + pfv.n_pf_coils_in_group[i] # Add one if an Central Solenoid is present, and make an extra group if bv.iohcl != 0: - pfv.nohc = pfv.nohc + 1 + pfv.n_cs_pf_coils = pfv.n_cs_pf_coils + 1 pfv.n_pf_coils_in_group[pfv.n_pf_coil_groups] = 1 # Add one for the plasma - pfv.n_pf_cs_plasma_circuits = pfv.nohc + 1 + pfv.n_pf_cs_plasma_circuits = pfv.n_cs_pf_coils + 1 # Overall current density in the Central Solenoid at beginning of pulse pfv.cohbop = pfv.coheof * pfv.fcohbop @@ -451,8 +451,8 @@ def pfcoil(self): # Required current change in CS coil # Proposed new calculation... - # dics = csflux / sxlg(nohc,n_pf_cs_plasma_circuits) - # BUT... sxlg(nohc,n_pf_cs_plasma_circuits) is around 2000 times ddics below... + # dics = csflux / sxlg(n_cs_pf_coils,n_pf_cs_plasma_circuits) + # BUT... sxlg(n_cs_pf_coils,n_pf_cs_plasma_circuits) is around 2000 times ddics below... ddics = ( 4.0e-7 @@ -745,8 +745,8 @@ def pfcoil(self): pfv.itr_sum = pfv.itr_sum + ( (bv.dr_bore + 0.5 * bv.dr_cs) - * pfv.n_pf_coil_turns[pfv.nohc - 1] - * pfv.cptdin[pfv.nohc - 1] + * pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1] + * pfv.cptdin[pfv.n_cs_pf_coils - 1] ) # Find Central Solenoid information @@ -758,7 +758,7 @@ def pfcoil(self): pfv.m_pf_coil_structure_total = 0.0e0 pf.ricpf = 0.0e0 - for i in range(pfv.nohc): + for i in range(pfv.n_cs_pf_coils): pfv.m_pf_coil_conductor_total = ( pfv.m_pf_coil_conductor_total + pfv.m_pf_coil_conductor[i] ) @@ -768,11 +768,11 @@ def pfcoil(self): pf.ricpf = pf.ricpf + abs(pfv.ric[i]) # Plasma size and shape - pfv.z_pf_coil_upper[pfv.nohc] = pv.rminor * pv.kappa - pfv.z_pf_coil_lower[pfv.nohc] = -pv.rminor * pv.kappa - pfv.r_pf_coil_inner[pfv.nohc] = pv.rmajor - pv.rminor - pfv.r_pf_coil_outer[pfv.nohc] = pv.rmajor + pv.rminor - pfv.n_pf_coil_turns[pfv.nohc] = 1.0e0 + pfv.z_pf_coil_upper[pfv.n_cs_pf_coils] = pv.rminor * pv.kappa + pfv.z_pf_coil_lower[pfv.n_cs_pf_coils] = -pv.rminor * pv.kappa + pfv.r_pf_coil_inner[pfv.n_cs_pf_coils] = pv.rmajor - pv.rminor + pfv.r_pf_coil_outer[pfv.n_cs_pf_coils] = pv.rmajor + pv.rminor + pfv.n_pf_coil_turns[pfv.n_cs_pf_coils] = 1.0e0 # Generate coil currents as a function of time using # user-provided waveforms etc. (cptdin, fcohbop, fcohbof) @@ -1013,18 +1013,22 @@ def ohcalc(self): hohc = bv.hmax * pfv.ohhghf # Z coordinates of coil edges - pfv.z_pf_coil_upper[pfv.nohc - 1] = hohc - pfv.z_pf_coil_lower[pfv.nohc - 1] = -pfv.z_pf_coil_upper[pfv.nohc - 1] + pfv.z_pf_coil_upper[pfv.n_cs_pf_coils - 1] = hohc + pfv.z_pf_coil_lower[pfv.n_cs_pf_coils - 1] = -pfv.z_pf_coil_upper[ + pfv.n_cs_pf_coils - 1 + ] # (R,Z) coordinates of coil centre - pfv.r_pf_coil_middle[pfv.nohc - 1] = pfv.r_cs_middle - pfv.z_pf_coil_middle[pfv.nohc - 1] = 0.0e0 + pfv.r_pf_coil_middle[pfv.n_cs_pf_coils - 1] = pfv.r_cs_middle + pfv.z_pf_coil_middle[pfv.n_cs_pf_coils - 1] = 0.0e0 # Radius of outer edge - pfv.r_pf_coil_outer[pfv.nohc - 1] = pfv.r_cs_middle + 0.5e0 * bv.dr_cs + pfv.r_pf_coil_outer[pfv.n_cs_pf_coils - 1] = pfv.r_cs_middle + 0.5e0 * bv.dr_cs # Radius of inner edge - pfv.r_pf_coil_inner[pfv.nohc - 1] = pfv.r_pf_coil_outer[pfv.nohc - 1] - bv.dr_cs + pfv.r_pf_coil_inner[pfv.n_cs_pf_coils - 1] = ( + pfv.r_pf_coil_outer[pfv.n_cs_pf_coils - 1] - bv.dr_cs + ) # Total cross-sectional area pfv.areaoh = 2.0e0 * hohc * bv.dr_cs @@ -1032,18 +1036,20 @@ def ohcalc(self): # Maximum current (MA-turns) in central Solenoid, at either BOP or EOF if pfv.cohbop > pfv.coheof: sgn = 1.0e0 - pfv.ric[pfv.nohc - 1] = sgn * 1.0e-6 * pfv.cohbop * pfv.areaoh + pfv.ric[pfv.n_cs_pf_coils - 1] = sgn * 1.0e-6 * pfv.cohbop * pfv.areaoh else: sgn = -1.0e0 - pfv.ric[pfv.nohc - 1] = sgn * 1.0e-6 * pfv.coheof * pfv.areaoh + pfv.ric[pfv.n_cs_pf_coils - 1] = sgn * 1.0e-6 * pfv.coheof * pfv.areaoh # Number of turns - pfv.n_pf_coil_turns[pfv.nohc - 1] = ( - 1.0e6 * abs(pfv.ric[pfv.nohc - 1]) / pfv.cptdin[pfv.nohc - 1] + pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1] = ( + 1.0e6 + * abs(pfv.ric[pfv.n_cs_pf_coils - 1]) + / pfv.cptdin[pfv.n_cs_pf_coils - 1] ) # Turn vertical cross-sectionnal area - pfv.a_oh_turn = pfv.areaoh / pfv.n_pf_coil_turns[pfv.nohc - 1] + pfv.a_oh_turn = pfv.areaoh / pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1] # Depth/width of cs turn conduit pfv.d_cond_cst = (pfv.a_oh_turn / pfv.ld_ratio_cst) ** 0.5 @@ -1072,7 +1078,7 @@ def ohcalc(self): csfv.t_structural_radial = 1.0e-3 # Non-steel area void fraction for coolant - pfv.vf[pfv.nohc - 1] = pfv.vfohc + pfv.vf[pfv.n_cs_pf_coils - 1] = pfv.vfohc # Peak field at the End-Of-Flattop (EOF) # Occurs at inner edge of coil; bmaxoh2 and bzi are of opposite sign at EOF @@ -1080,14 +1086,14 @@ def ohcalc(self): # Peak field due to central Solenoid itself bmaxoh2 = self.bfmax( pfv.coheof, - pfv.r_pf_coil_inner[pfv.nohc - 1], - pfv.r_pf_coil_outer[pfv.nohc - 1], + pfv.r_pf_coil_inner[pfv.n_cs_pf_coils - 1], + pfv.r_pf_coil_outer[pfv.n_cs_pf_coils - 1], hohc, ) # Peak field due to other PF coils plus plasma timepoint = 5 - bri, bro, bzi, bzo = self.peakb(pfv.nohc, 99, timepoint) + bri, bro, bzi, bzo = self.peakb(pfv.n_cs_pf_coils, 99, timepoint) pfv.bmaxoh = abs(bzi - bmaxoh2) @@ -1099,25 +1105,25 @@ def ohcalc(self): # Occurs at inner edge of coil; bmaxoh0 and bzi are of same sign at BOP pfv.bmaxoh0 = self.bfmax( pfv.cohbop, - pfv.r_pf_coil_inner[pfv.nohc - 1], - pfv.r_pf_coil_outer[pfv.nohc - 1], + pfv.r_pf_coil_inner[pfv.n_cs_pf_coils - 1], + pfv.r_pf_coil_outer[pfv.n_cs_pf_coils - 1], hohc, ) timepoint = 2 - bri, bro, bzi, bzo = self.peakb(pfv.nohc, 99, timepoint) + bri, bro, bzi, bzo = self.peakb(pfv.n_cs_pf_coils, 99, timepoint) pfv.bmaxoh0 = abs(pfv.bmaxoh0 + bzi) # Maximum field values - pfv.bpf[pfv.nohc - 1] = max(pfv.bmaxoh, abs(pfv.bmaxoh0)) - pf.bpf2[pfv.nohc - 1] = max(bohco, abs(bzo)) + pfv.bpf[pfv.n_cs_pf_coils - 1] = max(pfv.bmaxoh, abs(pfv.bmaxoh0)) + pf.bpf2[pfv.n_cs_pf_coils - 1] = max(bohco, abs(bzo)) # Stress ==> cross-sectional area of supporting steel to use if pfv.i_pf_conductor == 0: # Superconducting coil # New calculation from M. N. Wilson for hoop stress - pf.sig_hoop = self.hoop_stress(pfv.r_pf_coil_inner[pfv.nohc - 1]) + pf.sig_hoop = self.hoop_stress(pfv.r_pf_coil_inner[pfv.n_cs_pf_coils - 1]) # New calculation from Y. Iwasa for axial stress pf.sig_axial, pf.axial_force = self.axial_stress() @@ -1159,18 +1165,18 @@ def ohcalc(self): # Thickness of hypothetical steel cylinders assumed to encase the CS along # its inside and outside edges; in reality, the steel is distributed # throughout the conductor - pfv.pfcaseth[pfv.nohc - 1] = 0.25e0 * areaspf / hohc + pfv.pfcaseth[pfv.n_cs_pf_coils - 1] = 0.25e0 * areaspf / hohc else: areaspf = 0.0e0 # Resistive Central Solenoid - no steel needed - pfv.pfcaseth[pfv.nohc - 1] = 0.0e0 + pfv.pfcaseth[pfv.n_cs_pf_coils - 1] = 0.0e0 # Weight of steel - pfv.m_pf_coil_structure[pfv.nohc - 1] = ( + pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1] = ( areaspf * 2.0e0 * constants.pi - * pfv.r_pf_coil_middle[pfv.nohc - 1] + * pfv.r_pf_coil_middle[pfv.n_cs_pf_coils - 1] * fwbsv.denstl ) @@ -1186,21 +1192,21 @@ def ohcalc(self): # Weight of conductor in central Solenoid if pfv.i_pf_conductor == 0: - pfv.m_pf_coil_conductor[pfv.nohc - 1] = ( + pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1] = ( pfv.awpoh * (1.0e0 - pfv.vfohc) * 2.0e0 * constants.pi - * pfv.r_pf_coil_middle[pfv.nohc - 1] + * pfv.r_pf_coil_middle[pfv.n_cs_pf_coils - 1] * tfv.dcond[pfv.i_cs_superconductor - 1] ) else: - pfv.m_pf_coil_conductor[pfv.nohc - 1] = ( + pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1] = ( pfv.awpoh * (1.0e0 - pfv.vfohc) * 2.0e0 * constants.pi - * pfv.r_pf_coil_middle[pfv.nohc - 1] + * pfv.r_pf_coil_middle[pfv.n_cs_pf_coils - 1] * constants.dcopper ) @@ -1212,7 +1218,7 @@ def ohcalc(self): pfv.bmaxoh, pfv.vfohc, pfv.fcuohsu, - (abs(pfv.ric[pfv.nohc - 1]) / pfv.awpoh) * 1.0e6, + (abs(pfv.ric[pfv.n_cs_pf_coils - 1]) / pfv.awpoh) * 1.0e6, pfv.i_cs_superconductor, tfv.fhts, tfv.str_cs_con_res, @@ -1235,7 +1241,7 @@ def ohcalc(self): pfv.bmaxoh0, pfv.vfohc, pfv.fcuohsu, - (abs(pfv.ric[pfv.nohc - 1]) / pfv.awpoh) * 1.0e6, + (abs(pfv.ric[pfv.n_cs_pf_coils - 1]) / pfv.awpoh) * 1.0e6, pfv.i_cs_superconductor, tfv.fhts, tfv.str_cs_con_res, @@ -1244,8 +1250,8 @@ def ohcalc(self): tfv.tcritsc, ) - pfv.rjpfalw[pfv.nohc - 1] = jcritwp * pfv.awpoh / pfv.areaoh - pfv.rjohc0 = pfv.rjpfalw[pfv.nohc - 1] + pfv.rjpfalw[pfv.n_cs_pf_coils - 1] = jcritwp * pfv.awpoh / pfv.areaoh + pfv.rjohc0 = pfv.rjpfalw[pfv.n_cs_pf_coils - 1] pfv.temp_cs_margin = min(tmarg1, tmarg2) @@ -1258,7 +1264,7 @@ def ohcalc(self): * pfv.r_cs_middle * pfv.rho_pf_coil / (pfv.areaoh * (1.0e0 - pfv.vfohc)) - * (1.0e6 * pfv.ric[pfv.nohc - 1]) ** 2 + * (1.0e6 * pfv.ric[pfv.n_cs_pf_coils - 1]) ** 2 ) pfv.powpfres = pfv.powpfres + pfv.powohres @@ -1278,7 +1284,7 @@ def peakb(self, i, ii, it): The calculation includes the effects from all the coils and the plasma. """ - if bv.iohcl != 0 and i == pfv.nohc: + if bv.iohcl != 0 and i == pfv.n_cs_pf_coils: # Peak field is to be calculated at the Central Solenoid itself, # so exclude its own contribution; its self field is # dealt with externally using routine BFMAX @@ -1304,7 +1310,7 @@ def peakb(self, i, ii, it): # Current in each filament representing part of the Central Solenoid for iohc in range(pf.nfxf): pf.cfxf[iohc] = ( - pfv.waves[pfv.nohc - 1, it - 1] + pfv.waves[pfv.n_cs_pf_coils - 1, it - 1] * pfv.coheof * sgn * bv.dr_cs @@ -1385,7 +1391,7 @@ def peakb(self, i, ii, it): ) # bpf and bpf2 for the Central Solenoid are calculated in OHCALC - if (bv.iohcl != 0) and (i == pfv.nohc): + if (bv.iohcl != 0) and (i == pfv.n_cs_pf_coils): return bri, bro, bzi, bzo bpfin = math.sqrt(bri**2 + bzi**2) @@ -1485,32 +1491,36 @@ def vsec(self): # Central Solenoid startup volt-seconds if bv.iohcl != 0: - pf.vsdum[pfv.nohc - 1, 0] = ( + pf.vsdum[pfv.n_cs_pf_coils - 1, 0] = ( pfv.sxlg[ pfv.n_pf_cs_plasma_circuits - 1, pfv.n_pf_cs_plasma_circuits - 2 ] * pfv.c_pf_coil_turn[pfv.n_pf_cs_plasma_circuits - 2, 1] ) - pf.vsdum[pfv.nohc - 1, 1] = ( + pf.vsdum[pfv.n_cs_pf_coils - 1, 1] = ( pfv.sxlg[ pfv.n_pf_cs_plasma_circuits - 1, pfv.n_pf_cs_plasma_circuits - 2 ] * pfv.c_pf_coil_turn[pfv.n_pf_cs_plasma_circuits - 2, 2] ) - pfv.vsohsu = pf.vsdum[pfv.nohc - 1, 1] - pf.vsdum[pfv.nohc - 1, 0] + pfv.vsohsu = ( + pf.vsdum[pfv.n_cs_pf_coils - 1, 1] - pf.vsdum[pfv.n_cs_pf_coils - 1, 0] + ) # Total available volt-seconds for start-up pfv.vssu = pfv.vsohsu + pfv.vsefsu # Burn volt-seconds if bv.iohcl != 0: - pf.vsdum[pfv.nohc - 1, 2] = ( + pf.vsdum[pfv.n_cs_pf_coils - 1, 2] = ( pfv.sxlg[ pfv.n_pf_cs_plasma_circuits - 1, pfv.n_pf_cs_plasma_circuits - 2 ] * pfv.c_pf_coil_turn[pfv.n_pf_cs_plasma_circuits - 2, 4] ) - pfv.vsohbn = pf.vsdum[pfv.nohc - 1, 2] - pf.vsdum[pfv.nohc - 1, 1] + pfv.vsohbn = ( + pf.vsdum[pfv.n_cs_pf_coils - 1, 2] - pf.vsdum[pfv.n_cs_pf_coils - 1, 1] + ) # PF volt-seconds during burn pfv.vsefbn = 0.0e0 @@ -1538,10 +1548,10 @@ def hoop_stress(self, r): :return: hoop stress (MPa) :rtype: float """ - a = pfv.r_pf_coil_inner[pfv.nohc - 1] + a = pfv.r_pf_coil_inner[pfv.n_cs_pf_coils - 1] # Outer radius of central Solenoid [m] - b = pfv.r_pf_coil_outer[pfv.nohc - 1] + b = pfv.r_pf_coil_outer[pfv.n_cs_pf_coils - 1] # alpha alpha = b / a @@ -1604,13 +1614,13 @@ def axial_stress(self): :return: unsmeared axial stress [MPa], axial force [N] :rtype: tuple[float, float] """ - b = pfv.r_pf_coil_outer[pfv.nohc - 1] + b = pfv.r_pf_coil_outer[pfv.n_cs_pf_coils - 1] # Half height of central Solenoid [m] - hl = pfv.z_pf_coil_upper[pfv.nohc - 1] + hl = pfv.z_pf_coil_upper[pfv.n_cs_pf_coils - 1] # Central Solenoid current [A] - ni = pfv.ric[pfv.nohc - 1] * 1.0e6 + ni = pfv.ric[pfv.n_cs_pf_coils - 1] * 1.0e6 # kb term for elliptical integrals # kb2 = SQRT((4.0e0*b**2)/(4.0e0*b**2 + hl**2)) @@ -1642,8 +1652,8 @@ def axial_stress(self): # axial area [m2] area_ax = constants.pi * ( - pfv.r_pf_coil_outer[pfv.nohc - 1] ** 2 - - pfv.r_pf_coil_inner[pfv.nohc - 1] ** 2 + pfv.r_pf_coil_outer[pfv.n_cs_pf_coils - 1] ** 2 + - pfv.r_pf_coil_inner[pfv.n_cs_pf_coils - 1] ** 2 ) # calculate unsmeared axial stress [MPa] @@ -1687,10 +1697,10 @@ def induct(self, output): noh = int( math.ceil( 2.0e0 - * pfv.z_pf_coil_upper[pfv.nohc - 1] + * pfv.z_pf_coil_upper[pfv.n_cs_pf_coils - 1] / ( - pfv.r_pf_coil_outer[pfv.nohc - 1] - - pfv.r_pf_coil_inner[pfv.nohc - 1] + pfv.r_pf_coil_outer[pfv.n_cs_pf_coils - 1] + - pfv.r_pf_coil_inner[pfv.n_cs_pf_coils - 1] ) ) ) @@ -1715,10 +1725,12 @@ def induct(self, output): roh[:] = pfv.r_cs_middle delzoh = ( - 2.0e0 * pfv.z_pf_coil_upper[pfv.nohc - 1] / noh - ) # z_pf_coil_upper(nohc) is the half-height of the coil + 2.0e0 * pfv.z_pf_coil_upper[pfv.n_cs_pf_coils - 1] / noh + ) # z_pf_coil_upper(n_cs_pf_coils) is the half-height of the coil for i in range(noh): - zoh[i] = pfv.z_pf_coil_upper[pfv.nohc - 1] - delzoh * (0.5e0 + i) + zoh[i] = pfv.z_pf_coil_upper[pfv.n_cs_pf_coils - 1] - delzoh * ( + 0.5e0 + i + ) rplasma[0] = pv.rmajor # assumes nplas==1 zplasma[0] = 0.0 @@ -1762,11 +1774,11 @@ def induct(self, output): xc[ii] = 0.5e0 * (xcin[ii] + xcout[ii]) xohpl = xohpl + xc[ii] - pfv.sxlg[pfv.n_pf_cs_plasma_circuits - 1, pfv.nohc - 1] = ( - xohpl / (nplas * noh) * pfv.n_pf_coil_turns[pfv.nohc - 1] + pfv.sxlg[pfv.n_pf_cs_plasma_circuits - 1, pfv.n_cs_pf_coils - 1] = ( + xohpl / (nplas * noh) * pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1] ) - pfv.sxlg[pfv.nohc - 1, pfv.n_pf_cs_plasma_circuits - 1] = pfv.sxlg[ - pfv.n_pf_cs_plasma_circuits - 1, pfv.nohc - 1 + pfv.sxlg[pfv.n_cs_pf_coils - 1, pfv.n_pf_cs_plasma_circuits - 1] = pfv.sxlg[ + pfv.n_pf_cs_plasma_circuits - 1, pfv.n_cs_pf_coils - 1 ] # Plasma self inductance @@ -1798,12 +1810,13 @@ def induct(self, output): if bv.iohcl != 0: # Central Solenoid self inductance a = pfv.r_cs_middle # mean radius of coil - b = 2.0e0 * pfv.z_pf_coil_upper[pfv.nohc - 1] # length of coil + b = 2.0e0 * pfv.z_pf_coil_upper[pfv.n_cs_pf_coils - 1] # length of coil c = ( - pfv.r_pf_coil_outer[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1] + pfv.r_pf_coil_outer[pfv.n_cs_pf_coils - 1] + - pfv.r_pf_coil_inner[pfv.n_cs_pf_coils - 1] ) # radial winding thickness - pfv.sxlg[pfv.nohc - 1, pfv.nohc - 1] = self.selfinductance( - a, b, c, pfv.n_pf_coil_turns[pfv.nohc - 1] + pfv.sxlg[pfv.n_cs_pf_coils - 1, pfv.n_cs_pf_coils - 1] = ( + self.selfinductance(a, b, c, pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1]) ) # Central Solenoid / PF coil mutual inductances @@ -1823,21 +1836,21 @@ def induct(self, output): for j in range(pfv.n_pf_coils_in_group[i]): ncoilj = ncoils + 1 - (j + 1) - pfv.sxlg[ncoilj - 1, pfv.nohc - 1] = ( + pfv.sxlg[ncoilj - 1, pfv.n_cs_pf_coils - 1] = ( xohpf * pfv.n_pf_coil_turns[ncoilj - 1] - * pfv.n_pf_coil_turns[pfv.nohc - 1] + * pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1] / noh ) - pfv.sxlg[pfv.nohc - 1, ncoilj - 1] = pfv.sxlg[ - ncoilj - 1, pfv.nohc - 1 + pfv.sxlg[pfv.n_cs_pf_coils - 1, ncoilj - 1] = pfv.sxlg[ + ncoilj - 1, pfv.n_cs_pf_coils - 1 ] # PF coil - PF coil inductances if bv.iohcl == 0: - pf.nef = pfv.nohc + pf.nef = pfv.n_cs_pf_coils else: - pf.nef = pfv.nohc - 1 + pf.nef = pfv.n_cs_pf_coils - 1 for i in range(pf.nef): for j in range(pf.nef - 1): @@ -2374,7 +2387,7 @@ def outpf(self): ) # pf.nef is the number of coils excluding the Central Solenoid - pf.nef = pfv.nohc + pf.nef = pfv.n_cs_pf_coils if bv.iohcl != 0: pf.nef = pf.nef - 1 @@ -2441,49 +2454,55 @@ def outpf(self): if bv.iohcl != 0: op.write( self.outfile, - f"CS\t\t\t\t{pfv.r_pf_coil_middle[pfv.nohc - 1]:.2e}\t{pfv.z_pf_coil_middle[pfv.nohc - 1]:.2e}\t{pfv.r_pf_coil_outer[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]:.2e}\t{abs(pfv.z_pf_coil_upper[pfv.nohc - 1] - pfv.z_pf_coil_lower[pfv.nohc - 1]):.2e}\t{pfv.n_pf_coil_turns[pfv.nohc - 1]:.2e}\t{pfv.pfcaseth[pfv.nohc - 1]:.2e}", + f"CS\t\t\t\t{pfv.r_pf_coil_middle[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.z_pf_coil_middle[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.r_pf_coil_outer[pfv.n_cs_pf_coils - 1] - pfv.r_pf_coil_inner[pfv.n_cs_pf_coils - 1]:.2e}\t{abs(pfv.z_pf_coil_upper[pfv.n_cs_pf_coils - 1] - pfv.z_pf_coil_lower[pfv.n_cs_pf_coils - 1]):.2e}\t{pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.pfcaseth[pfv.n_cs_pf_coils - 1]:.2e}", ) op.ovarre( self.mfile, "Central solenoid radius (m)", - "(r_pf_coil_middle[nohc-1])", - pfv.r_pf_coil_middle[pfv.nohc - 1], + "(r_pf_coil_middle[n_cs_pf_coils-1])", + pfv.r_pf_coil_middle[pfv.n_cs_pf_coils - 1], ) op.ovarre( self.mfile, "Central solenoid vertical position (m)", - "(z_pf_coil_middle[nohc-1])", - pfv.z_pf_coil_middle[pfv.nohc - 1], + "(z_pf_coil_middle[n_cs_pf_coils-1])", + pfv.z_pf_coil_middle[pfv.n_cs_pf_coils - 1], ) op.ovarre( self.mfile, "Central solenoid radial thickness (m)", "(ohdr)", - (pfv.r_pf_coil_outer[pfv.nohc - 1] - pfv.r_pf_coil_inner[pfv.nohc - 1]), + ( + pfv.r_pf_coil_outer[pfv.n_cs_pf_coils - 1] + - pfv.r_pf_coil_inner[pfv.n_cs_pf_coils - 1] + ), ) op.ovarre( self.mfile, "Central solenoid vertical thickness (m)", "(ohdz)", - (pfv.z_pf_coil_upper[pfv.nohc - 1] - pfv.z_pf_coil_lower[pfv.nohc - 1]), + ( + pfv.z_pf_coil_upper[pfv.n_cs_pf_coils - 1] + - pfv.z_pf_coil_lower[pfv.n_cs_pf_coils - 1] + ), ) op.ovarre( self.mfile, "Central solenoid turns", - "(n_pf_coil_turns[nohc-1])", - pfv.n_pf_coil_turns[pfv.nohc - 1], + "(n_pf_coil_turns[n_cs_pf_coils-1])", + pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1], ) op.ovarre( self.mfile, "Central solenoid current (MA)", - "(ric[nohc-1])", - pfv.ric[pfv.nohc - 1], + "(ric[n_cs_pf_coils-1])", + pfv.ric[pfv.n_cs_pf_coils - 1], ) op.ovarre( self.mfile, "Central solenoid field (T)", - "(bpf[nohc-1])", - pfv.bpf[pfv.nohc - 1], + "(bpf[n_cs_pf_coils-1])", + pfv.bpf[pfv.n_cs_pf_coils - 1], ) # Plasma @@ -2524,12 +2543,12 @@ def outpf(self): # Issue #328 op.write( self.outfile, - f"CS\t\t{pfv.ric[pfv.nohc - 1]:.2e}\t{pfv.rjpfalw[pfv.nohc - 1]:.2e}\t{max(abs(pfv.cohbop), abs(pfv.coheof)):.2e}\t{max(abs(pfv.cohbop), abs(pfv.coheof)) / pfv.rjpfalw[pfv.nohc - 1]:.2e}\t{pfv.m_pf_coil_conductor[pfv.nohc - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.nohc - 1]:.2e}\t{pfv.bpf[pfv.nohc - 1]:.2e}", + f"CS\t\t{pfv.ric[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.rjpfalw[pfv.n_cs_pf_coils - 1]:.2e}\t{max(abs(pfv.cohbop), abs(pfv.coheof)):.2e}\t{max(abs(pfv.cohbop), abs(pfv.coheof)) / pfv.rjpfalw[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.bpf[pfv.n_cs_pf_coils - 1]:.2e}", ) else: op.write( self.outfile, - f"CS\t\t{pfv.ric[pfv.nohc - 1]:.2e}\t-1.0e0\t{max(abs(pfv.cohbop)):.2e}\t{abs(pfv.coheof):.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[pfv.nohc - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.nohc - 1]:.2e}\t{pfv.bpf[pfv.nohc - 1]:.2e}", + f"CS\t\t{pfv.ric[pfv.n_cs_pf_coils - 1]:.2e}\t-1.0e0\t{max(abs(pfv.cohbop)):.2e}\t{abs(pfv.coheof):.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.bpf[pfv.n_cs_pf_coils - 1]:.2e}", ) # Miscellaneous totals @@ -2602,7 +2621,7 @@ def outvolt(self): op.write( self.outfile, - f"\tCS coil\t\t\t{pf.vsdum[pfv.nohc - 1, 0]:.3f}\t\t\t{pf.vsdum[pfv.nohc - 1, 1]:.3f}\t\t{pf.vsdum[pfv.nohc - 1, 2]:.3f}", + f"\tCS coil\t\t\t{pf.vsdum[pfv.n_cs_pf_coils - 1, 0]:.3f}\t\t\t{pf.vsdum[pfv.n_cs_pf_coils - 1, 1]:.3f}\t\t{pf.vsdum[pfv.n_cs_pf_coils - 1, 2]:.3f}", ) op.oshead(self.outfile, "Waveforms") @@ -2738,11 +2757,11 @@ def waveform(self): waves[i,j] is the current in coil i, at time j, normalized to the peak current in that coil at any time. """ - nplas = pfv.nohc + 1 + nplas = pfv.n_cs_pf_coils + 1 for it in range(6): pfv.waves[nplas - 1, it] = 1.0e0 - for ic in range(pfv.nohc): + for ic in range(pfv.n_cs_pf_coils): # Find where the peak current occurs # Beginning of pulse, t = t_precharge if (abs(pfv.curpfb[ic]) >= abs(pfv.curpfs[ic])) and ( diff --git a/process/pulse.py b/process/pulse.py index ae34a45037..8c50267f38 100644 --- a/process/pulse.py +++ b/process/pulse.py @@ -51,11 +51,11 @@ def tohswg(self, output: bool) -> None: # Current/turn in Central Solenoid at beginning of pulse (A/turn) - ioht1 = pfcoil_variables.c_pf_coil_turn[pfcoil_variables.nohc - 1, 1] + ioht1 = pfcoil_variables.c_pf_coil_turn[pfcoil_variables.n_cs_pf_coils - 1, 1] # Current/turn in Central Solenoid at start of flat-top (A/turn) - ioht2 = pfcoil_variables.c_pf_coil_turn[pfcoil_variables.nohc - 1, 2] + ioht2 = pfcoil_variables.c_pf_coil_turn[pfcoil_variables.n_cs_pf_coils - 1, 2] # Central Solenoid resistance (ohms) @@ -64,14 +64,17 @@ def tohswg(self, output: bool) -> None: else: r = ( pfcoil_variables.powohres - / (1.0e6 * pfcoil_variables.ric[pfcoil_variables.nohc - 1]) ** 2 + / (1.0e6 * pfcoil_variables.ric[pfcoil_variables.n_cs_pf_coils - 1]) + ** 2 ) # Central Solenoid bus resistance (ohms) (assumed to include power supply) # Bus parameters taken from routine PFPWR. pfbusl = 8.0e0 * physics_variables.rmajor + 140.0e0 - albusa = abs(pfcoil_variables.cptdin[pfcoil_variables.nohc - 1]) / 100.0e0 + albusa = ( + abs(pfcoil_variables.cptdin[pfcoil_variables.n_cs_pf_coils - 1]) / 100.0e0 + ) # rho = 1.5e0 * 2.62e-4 * pfbusl / albusa # I have removed the fudge factor of 1.5 but included it in the value of rhopfbus @@ -84,13 +87,14 @@ def tohswg(self, output: bool) -> None: # Mutual inductance between Central Solenoid and plasma (H) m = pfcoil_variables.sxlg[ - pfcoil_variables.nohc - 1, pfcoil_variables.n_pf_cs_plasma_circuits - 1 + pfcoil_variables.n_cs_pf_coils - 1, + pfcoil_variables.n_pf_cs_plasma_circuits - 1, ] # Self inductance of Central Solenoid (H) loh = pfcoil_variables.sxlg[ - pfcoil_variables.nohc - 1, pfcoil_variables.nohc - 1 + pfcoil_variables.n_cs_pf_coils - 1, pfcoil_variables.n_cs_pf_coils - 1 ] # Maximum rate of change of plasma current (A/s) @@ -107,7 +111,10 @@ def tohswg(self, output: bool) -> None: / ( ioht2 * ( - r * pfcoil_variables.n_pf_coil_turns[pfcoil_variables.nohc - 1] + r + * pfcoil_variables.n_pf_coil_turns[ + pfcoil_variables.n_cs_pf_coils - 1 + ] + rho ) - v diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index c59e334e2d..b4271c2fce 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -211,7 +211,7 @@ module pfcoil_variables integer :: n_pf_coil_groups !! number of groups of PF coils. Symmetric coil pairs should all be in the same group - integer :: nohc + integer :: n_cs_pf_coils !! number of PF coils (excluding the central solenoid) + 1 real(dp) :: ohhghf @@ -460,7 +460,7 @@ subroutine init_pfcoil_variables n_pf_coils_in_group = (/1,1,2,0,0,0,0,0,0,0,0,0/) nfxfh = 7 n_pf_coil_groups = 3 - nohc = 0 + n_cs_pf_coils = 0 ohhghf = 0.71D0 oh_steel_frac = 0.5D0 pf_current_safety_factor = 1.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index b790b42769..479c0c62d8 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -857,13 +857,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2734E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6308E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8523E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4050E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6308E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8523E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 92244a238f..c8603ebf72 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -858,13 +858,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2734E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6308E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8523E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4050E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6308E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8523E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 098a008780..041b3860a2 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -858,13 +858,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2734E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6308E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8523E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4050E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6308E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8523E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index b6f8b1a992..ff987843f1 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -858,13 +858,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2734E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2734E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6308E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8523E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4050E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6308E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8523E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index b3eb439d3a..c3ddaf7885 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -861,13 +861,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.2990E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.1960E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5683E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2588E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2588E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7696E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6221E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8489E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4055E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6221E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8489E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4055E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.4358E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index f0641fa030..a7f11eaa9f 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -859,13 +859,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3077E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2309E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5692E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3263E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3263E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5540E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6787E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8715E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4070E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6787E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8715E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4070E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8645E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -2022,13 +2022,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3146E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2585E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5753E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3448E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3448E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5277E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6691E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8677E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4035E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6691E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8677E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4035E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9674E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -3185,13 +3185,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3194E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2776E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5793E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3583E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3583E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5352E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6652E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8661E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4029E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6652E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8661E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4029E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0546E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -4348,13 +4348,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3187E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2748E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5786E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3569E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3569E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5349E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6617E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8647E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4028E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6617E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8647E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4028E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0446E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -5511,13 +5511,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3167E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2667E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5777E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3448E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3448E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5266E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6732E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8693E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4030E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6732E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8693E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4030E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9622E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -6674,13 +6674,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3108E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2432E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5729E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3304E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3304E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4639E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6670E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8668E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4019E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6670E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8668E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4019E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8404E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -7837,13 +7837,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3103E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2413E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5724E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3294E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3294E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4494E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6619E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8648E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4010E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6619E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8648E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4010E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8266E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -9000,13 +9000,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3141E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2565E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5749E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3439E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3439E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4622E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6621E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8648E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4004E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6621E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8648E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4004E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9210E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -10163,13 +10163,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3157E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2629E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5747E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3578E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3578E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4724E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6615E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8646E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.3999E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6615E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8646E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.3999E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0077E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -11326,13 +11326,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3175E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2700E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5770E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3570E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3570E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4720E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6601E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8640E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.3998E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6601E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8640E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.3998E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0009E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -12489,13 +12489,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3167E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2670E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5783E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3426E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3426E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4697E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6609E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8643E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4002E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6609E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8643E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4002E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9208E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -13652,13 +13652,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3131E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2525E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5762E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3286E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3286E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4537E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6527E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8611E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.3997E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6527E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8611E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.3997E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8389E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -14815,13 +14815,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3145E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2578E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5780E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3276E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3276E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4535E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6506E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8602E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.3996E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6506E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8602E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.3996E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8318E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -15978,13 +15978,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3202E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2808E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5828E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3422E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3422E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4673E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6556E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8622E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.3991E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6556E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8622E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.3991E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9246E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -17141,13 +17141,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3262E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.3046E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5879E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.3568E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3568E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4798E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6592E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8637E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.3987E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6592E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8637E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.3987E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0197E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index df45065057..b4343d5b87 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -694,13 +694,13 @@ PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 - Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 + Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 + Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -1689,13 +1689,13 @@ PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 - Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 + Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 + Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -2684,13 +2684,13 @@ PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 - Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 + Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 + Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -3679,13 +3679,13 @@ PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 - Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 + Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 + Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -4674,13 +4674,13 @@ PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 - Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 + Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 + Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -5669,13 +5669,13 @@ PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 - Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 + Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 + Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -6664,13 +6664,13 @@ PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 - Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 + Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 + Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -7659,13 +7659,13 @@ PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 - Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 + Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 + Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -8654,13 +8654,13 @@ PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(nohc))___________________ 2.6164E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(nohc))___________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(nohc))_________________ 3.5015E+03 - Central_solenoid_current_(MA)___________________________________________ (ric(nohc))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(nohc))___________________ 1.1499E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 + Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 + Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 6afae6437f..b8576607af 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3410,7 +3410,7 @@ "nls": null, "nnetau": 0.0, "no_roots": 30.0, - "nohc": 0.0, + "n_cs_pf_coils": 0.0, "beta_norm_total": 0.0, "nout": 11.0, "noutvars": 84.0, @@ -10170,7 +10170,7 @@ "nls": "", "nnetau": "", "no_roots": "", - "nohc": "number of PF coils (excluding the central solenoid) + 1", + "n_cs_pf_coils": "number of PF coils (excluding the central solenoid) + 1", "beta_norm_total": "normaised total beta", "nout": "Output file unit identifier", "noutvars": "", @@ -18963,7 +18963,7 @@ "n_pf_coils_in_group", "nfxfh", "n_pf_coil_groups", - "nohc", + "n_cs_pf_coils", "ohhghf", "oh_steel_frac", "pfcaseth", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 4fd1e76a62..f9a34e280c 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -59,7 +59,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "rpf1", 0.0) monkeypatch.setattr(pfv, "m_pf_coil_structure_total", 0.0) monkeypatch.setattr(pfv, "curpff", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "nohc", 0) + monkeypatch.setattr(pfv, "n_cs_pf_coils", 0) monkeypatch.setattr(pfv, "pfrmax", 0.0) monkeypatch.setattr(pfv, "fcohbop", 1.0) monkeypatch.setattr(pfv, "rjconpf", np.full(22, 1.1e7)) @@ -191,7 +191,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(bv, "dr_cs", 6.510e-1) monkeypatch.setattr(fwbsv, "denstl", 7.8e3) monkeypatch.setattr(eh, "idiags", np.full(8, 0)) - monkeypatch.setattr(pfv, "nohc", 5) + monkeypatch.setattr(pfv, "n_cs_pf_coils", 5) monkeypatch.setattr(pfv, "bmaxoh", 1.4e1) monkeypatch.setattr(pfv, "i_cs_stress", 0) monkeypatch.setattr(pfv, "coheof", 1.693e7) @@ -2247,7 +2247,7 @@ def test_peakb(monkeypatch: pytest.MonkeyPatch, pfcoil: PFCoil): 0, ]), ) - monkeypatch.setattr(pfv, "nohc", 7) + monkeypatch.setattr(pfv, "n_cs_pf_coils", 7) monkeypatch.setattr( pfv, "ric", @@ -2618,7 +2618,7 @@ def test_axial_stress(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): :type monkeypatch: _pytest.monkeypatch.MonkeyPatch """ monkeypatch.setattr(pfv, "oh_steel_frac", 0.57874999999999999) - monkeypatch.setattr(pfv, "nohc", 7) + monkeypatch.setattr(pfv, "n_cs_pf_coils", 7) monkeypatch.setattr( pfv, "r_pf_coil_outer", @@ -2782,7 +2782,7 @@ def test_induct(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): -999999, ]), ) - monkeypatch.setattr(pfv, "nohc", 7) + monkeypatch.setattr(pfv, "n_cs_pf_coils", 7) monkeypatch.setattr( pfv, "n_pf_coil_turns", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 7ed58de99a..53f8682253 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -861,13 +861,13 @@ PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.2990E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.1960E+00 PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5683E+00 - Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[nohc-1])_________________ 2.2588E+00 - Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[nohc-1])_________________ 0.0000E+00 + Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2588E+00 + Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7696E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 - Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[nohc-1])_______________ 4.6221E+03 - Central_solenoid_current_(MA)___________________________________________ (ric[nohc-1])_________________ -1.8489E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[nohc-1])_________________ 1.4055E+01 + Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6221E+03 + Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8489E+02 + Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4055E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.4358E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 4e39749493..4e6485d3a0 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -2030,7 +2030,7 @@ class Acc2222Param(NamedTuple): vfohc: Any = None - nohc: Any = None + n_cs_pf_coils: Any = None n_pf_coil_turns: Any = None @@ -2131,7 +2131,7 @@ class Acc2222Param(NamedTuple): j_crit_str_pf=200.0, i_pf_conductor=0, vfohc=0.29999999999999999, - nohc=7, + n_cs_pf_coils=7, n_pf_coil_turns=np.array( np.array( ( @@ -2327,7 +2327,7 @@ class Acc2222Param(NamedTuple): j_crit_str_pf=200.0, i_pf_conductor=0, vfohc=0.29999999999999999, - nohc=7, + n_cs_pf_coils=7, n_pf_coil_turns=np.array( np.array( ( @@ -2523,7 +2523,7 @@ class Acc2222Param(NamedTuple): j_crit_str_pf=200.0, i_pf_conductor=0, vfohc=0.29999999999999999, - nohc=7, + n_cs_pf_coils=7, n_pf_coil_turns=np.array( np.array( ( @@ -2719,7 +2719,7 @@ def test_acc2222(acc2222param, monkeypatch, costs): monkeypatch.setattr(pfcoil_variables, "vfohc", acc2222param.vfohc) - monkeypatch.setattr(pfcoil_variables, "nohc", acc2222param.nohc) + monkeypatch.setattr(pfcoil_variables, "n_cs_pf_coils", acc2222param.n_cs_pf_coils) monkeypatch.setattr( pfcoil_variables, "n_pf_coil_turns", acc2222param.n_pf_coil_turns diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index de03ddf150..5526b14946 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1063,7 +1063,7 @@ def test_waveform(monkeypatch, pfcoil): """ ngc2 = 22 monkeypatch.setattr(pfv, "ric", np.zeros(ngc2, dtype=int)) - monkeypatch.setattr(pfv, "nohc", 7) + monkeypatch.setattr(pfv, "n_cs_pf_coils", 7) monkeypatch.setattr(pfv, "waves", np.zeros((ngc2, 6), order="F")) monkeypatch.setattr( pfv, @@ -1223,7 +1223,7 @@ def test_vsec(pfcoil, monkeypatch): monkeypatch.setattr(bv, "iohcl", 1) monkeypatch.setattr(pfv, "vsefsu", 0) monkeypatch.setattr(pfv, "vsbn", 0) - monkeypatch.setattr(pfv, "nohc", 7) + monkeypatch.setattr(pfv, "n_cs_pf_coils", 7) monkeypatch.setattr(pfv, "vsohbn", 0) monkeypatch.setattr( pfv, @@ -1979,7 +1979,7 @@ def test_hoop_stress(pfcoil, monkeypatch): monkeypatch.setattr(pfv, "oh_steel_frac", 0.57874999999999999) monkeypatch.setattr(pfv, "bmaxoh0", 13.522197474024983) monkeypatch.setattr(pfv, "cohbop", 19311657.760000002) - monkeypatch.setattr(pfv, "nohc", 7) + monkeypatch.setattr(pfv, "n_cs_pf_coils", 7) monkeypatch.setattr( pfv, "r_pf_coil_outer", diff --git a/tests/unit/test_pulse.py b/tests/unit/test_pulse.py index 6de89dff3d..4fabee682c 100644 --- a/tests/unit/test_pulse.py +++ b/tests/unit/test_pulse.py @@ -34,7 +34,7 @@ class TohswgParam(NamedTuple): i_pf_conductor: Any = None - nohc: Any = None + n_cs_pf_coils: Any = None powohres: Any = None @@ -101,7 +101,7 @@ class BurnParam(NamedTuple): vpfskv=0, n_pf_cs_plasma_circuits=8, i_pf_conductor=0, - nohc=7, + n_cs_pf_coils=7, powohres=0, sxlg=np.array( ( @@ -659,7 +659,7 @@ class BurnParam(NamedTuple): vpfskv=20, n_pf_cs_plasma_circuits=8, i_pf_conductor=0, - nohc=7, + n_cs_pf_coils=7, powohres=0, sxlg=np.array( ( @@ -1239,7 +1239,7 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): monkeypatch.setattr(pfcoil_variables, "i_pf_conductor", tohswgparam.i_pf_conductor) - monkeypatch.setattr(pfcoil_variables, "nohc", tohswgparam.nohc) + monkeypatch.setattr(pfcoil_variables, "n_cs_pf_coils", tohswgparam.n_cs_pf_coils) monkeypatch.setattr(pfcoil_variables, "powohres", tohswgparam.powohres) From fa62ae73621f9928757e236788dc941ec81d9308 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 15:03:11 +0000 Subject: [PATCH 25/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'pfrmax'=20to=20'?= =?UTF-8?q?r=5Fpf=5Fcoil=5Fouter=5Fmax'=20across=20multiple=20files=20for?= =?UTF-8?q?=20consistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/buildings.py | 6 ++++-- process/costs_2015.py | 2 +- process/pfcoil.py | 6 ++++-- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/integration/test_pfcoil_int.py | 2 +- tests/unit/test_buildings.py | 10 ++++++---- tests/unit/test_costs_2015.py | 12 ++++++++---- 8 files changed, 29 insertions(+), 19 deletions(-) diff --git a/process/buildings.py b/process/buildings.py index 5ee18495d0..b212009ac7 100644 --- a/process/buildings.py +++ b/process/buildings.py @@ -74,7 +74,7 @@ def run(self, output: bool = False): buildings_variables.elevol, ) = self.bldgs( output, - pfcoil_variables.pfrmax, + pfcoil_variables.r_pf_coil_outer_max, pfcoil_variables.pfmmax, tfro, tfri, @@ -396,7 +396,9 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): # Lateral size driven by radial width of largest component, from: # PF coil max radius, cryostat radius, TF coil outer radius width_reactor_piece = max( - pfcoil_variables.pfrmax, fwbs_variables.r_cryostat_inboard, tf_radial_dim + pfcoil_variables.r_pf_coil_outer_max, + fwbs_variables.r_cryostat_inboard, + tf_radial_dim, ) # Allow for biological shielding around reactor width_reactor_piece = width_reactor_piece + buildings_variables.bioshld_thk diff --git a/process/costs_2015.py b/process/costs_2015.py index 6086fb93bc..7521a85db1 100644 --- a/process/costs_2015.py +++ b/process/costs_2015.py @@ -578,7 +578,7 @@ def calc_building_costs(self): self.s_label[4] = "PF Coil winding building" self.s_cref[4] = 190000.0e0 * cost_variables.light_build_cost_per_vol # Scale with the radius of the largest PF coil squared (m^2) - self.s_k[4] = pfcoil_variables.pfrmax**2 + self.s_k[4] = pfcoil_variables.r_pf_coil_outer_max**2 self.s_kref[4] = 12.4e0**2 self.s_cost[4] = ( self.s_cost_factor[4] * self.s_cref[4] * (self.s_k[4] / self.s_kref[4]) diff --git a/process/pfcoil.py b/process/pfcoil.py index 627f5cd6e2..64976fecf4 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -524,7 +524,7 @@ def pfcoil(self): # Dimensions are those of the winding pack, and exclude # the steel supporting case i = 0 - pfv.pfrmax = 0.0e0 + pfv.r_pf_coil_outer_max = 0.0e0 dz = 0 @@ -587,7 +587,9 @@ def pfcoil(self): pfv.z_pf_coil_upper[i] = pfv.z_pf_coil_middle[i] - dx # Outside radius of largest PF coil (m) - pfv.pfrmax = max(pfv.pfrmax, pfv.r_pf_coil_outer[i]) + pfv.r_pf_coil_outer_max = max( + pfv.r_pf_coil_outer_max, pfv.r_pf_coil_outer[i] + ) i = i + 1 diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index b4271c2fce..6541d7f376 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -237,7 +237,7 @@ module pfcoil_variables real(dp) :: pfmmax !! mass of heaviest PF coil (tonnes) - real(dp) :: pfrmax + real(dp) :: r_pf_coil_outer_max !! radius of largest PF coil (m) real(dp) :: pfwpmw @@ -468,7 +468,7 @@ subroutine init_pfcoil_variables rho_pf_coil = 2.5D-8 rhopfbus = 3.93D-8 pfmmax = 0.0D0 - pfrmax = 0.0D0 + r_pf_coil_outer_max = 0.0D0 pfwpmw = 0.0D0 powohres = 0.0D0 powpfres = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index b8576607af..182884614b 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3509,7 +3509,7 @@ "pfckts": 0.0, "rho_pf_coil": 2.5e-08, "pfmmax": 0.0, - "pfrmax": 0.0, + "r_pf_coil_outer_max": 0.0, "charged_particle_power": 0.0, "pfusife": 1000.0, "pfwdiv": 0.0, @@ -10267,7 +10267,7 @@ "pfckts": "number of PF coil circuits", "rho_pf_coil": "PF coil resistivity (if i_pf_conductor=1) (Ohm-m)", "pfmmax": "mass of heaviest PF coil (tonnes)", - "pfrmax": "radius of largest PF coil (m)", + "r_pf_coil_outer_max": "radius of largest PF coil (m)", "charged_particle_power": "charged particle fusion power (MW)", "pfusife": "IFE input fusion power (MW) (`ifedrv=3 only`; `itv 155`)", "pfwdiv": "heat removal from first wall/divertor (MW)", @@ -18969,7 +18969,7 @@ "pfcaseth", "rho_pf_coil", "pfmmax", - "pfrmax", + "r_pf_coil_outer_max", "pfwpmw", "powohres", "powpfres", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index f9a34e280c..c01d2ff66e 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -60,7 +60,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "m_pf_coil_structure_total", 0.0) monkeypatch.setattr(pfv, "curpff", np.full(22, 0.0)) monkeypatch.setattr(pfv, "n_cs_pf_coils", 0) - monkeypatch.setattr(pfv, "pfrmax", 0.0) + monkeypatch.setattr(pfv, "r_pf_coil_outer_max", 0.0) monkeypatch.setattr(pfv, "fcohbop", 1.0) monkeypatch.setattr(pfv, "rjconpf", np.full(22, 1.1e7)) monkeypatch.setattr(pfv, "n_pf_coil_groups", 4) diff --git a/tests/unit/test_buildings.py b/tests/unit/test_buildings.py index 04fd52bb03..7e2c4170e0 100644 --- a/tests/unit/test_buildings.py +++ b/tests/unit/test_buildings.py @@ -133,7 +133,7 @@ class BldgsSizesParam(NamedTuple): iefrf: Any n_tf_coils: Any i_tf_sup: Any - pfrmax: Any + r_pf_coil_outer_max: Any tlife: Any cplife: Any divlife: Any @@ -276,7 +276,7 @@ class BldgsSizesParam(NamedTuple): iefrf=10, n_tf_coils=16, i_tf_sup=1, - pfrmax=18.98258241468535, + r_pf_coil_outer_max=18.98258241468535, tlife=40, cplife=0, divlife=0, @@ -415,7 +415,7 @@ class BldgsSizesParam(NamedTuple): iefrf=10, n_tf_coils=16, i_tf_sup=1, - pfrmax=18.982980877139834, + r_pf_coil_outer_max=18.982980877139834, tlife=40, cplife=0, divlife=6.1337250397740126, @@ -674,7 +674,9 @@ def test_bldgs_sizes(buildings, bldgssizesparam, monkeypatch): monkeypatch.setattr(current_drive_variables, "iefrf", bldgssizesparam.iefrf) monkeypatch.setattr(tfcoil_variables, "n_tf_coils", bldgssizesparam.n_tf_coils) monkeypatch.setattr(tfcoil_variables, "i_tf_sup", bldgssizesparam.i_tf_sup) - monkeypatch.setattr(pfcoil_variables, "pfrmax", bldgssizesparam.pfrmax) + monkeypatch.setattr( + pfcoil_variables, "r_pf_coil_outer_max", bldgssizesparam.r_pf_coil_outer_max + ) monkeypatch.setattr(cost_variables, "tlife", bldgssizesparam.tlife) monkeypatch.setattr(cost_variables, "cplife", bldgssizesparam.cplife) monkeypatch.setattr(cost_variables, "divlife", bldgssizesparam.divlife) diff --git a/tests/unit/test_costs_2015.py b/tests/unit/test_costs_2015.py index 695d9f0fd0..d7e01d308b 100644 --- a/tests/unit/test_costs_2015.py +++ b/tests/unit/test_costs_2015.py @@ -32,7 +32,7 @@ def costs2015(): class CalcBuildingCostsParam(NamedTuple): pwpnb: Any = None - pfrmax: Any = None + r_pf_coil_outer_max: Any = None pthermmw: Any = None @@ -82,7 +82,7 @@ class CalcBuildingCostsParam(NamedTuple): ( CalcBuildingCostsParam( pwpnb=109.38112972595434, - pfrmax=17.814040399601147, + r_pf_coil_outer_max=17.814040399601147, pthermmw=2112.8165753998965, psechtmw=311.54038043019023, helpow=142703.41458500578, @@ -1182,7 +1182,7 @@ class CalcBuildingCostsParam(NamedTuple): ), CalcBuildingCostsParam( pwpnb=109.38112972595434, - pfrmax=17.81462428923539, + r_pf_coil_outer_max=17.81462428923539, pthermmw=2111.8102173541502, psechtmw=640.27066522894324, helpow=823308.59959198488, @@ -2292,7 +2292,11 @@ def test_calc_building_costs(calcbuildingcostsparam, monkeypatch, costs2015): monkeypatch.setattr(current_drive_variables, "pwpnb", calcbuildingcostsparam.pwpnb) - monkeypatch.setattr(pfcoil_variables, "pfrmax", calcbuildingcostsparam.pfrmax) + monkeypatch.setattr( + pfcoil_variables, + "r_pf_coil_outer_max", + calcbuildingcostsparam.r_pf_coil_outer_max, + ) monkeypatch.setattr( heat_transport_variables, "pthermmw", calcbuildingcostsparam.pthermmw From 89708860dd1cb2824fb52b9d4aa7a06c34986f94 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 15:15:36 +0000 Subject: [PATCH 26/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'cohbop'=20to=20'?= =?UTF-8?q?j=5Fcs=5Fpulse=5Fstart'=20across=20multiple=20files=20for=20con?= =?UTF-8?q?sistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/pfcoil.py | 29 ++++++++++-------- process/sctfcoil.py | 6 ++-- source/fortran/constraint_equations.f90 | 8 ++--- source/fortran/pfcoil_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/integration/test_pfcoil_int.py | 6 ++-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_pfcoil.py | 2 +- tests/unit/test_sctfcoil.py | 8 ++--- 23 files changed, 82 insertions(+), 77 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 244c0f9022..b73db2fc18 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -778,7 +778,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5395E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0618E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.4704E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.9770E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9770E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3221E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 4.2900E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.2870E+08 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 79f38191d8..277921980b 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -773,7 +773,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.9126E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 754f12d151..994622e387 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -773,7 +773,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.9126E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index efd04e4cb6..ecc44d337c 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -773,7 +773,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.9126E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 82cb4dc169..56ab06a9cb 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -773,7 +773,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.9126E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 15332a83d3..dc245ac1ba 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -621,7 +621,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.2788E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP @@ -1616,7 +1616,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.2788E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP @@ -2611,7 +2611,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.2788E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP @@ -3606,7 +3606,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.2788E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP @@ -4601,7 +4601,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.2788E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP @@ -5596,7 +5596,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.2788E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP @@ -6591,7 +6591,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.2788E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP @@ -7586,7 +7586,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.2788E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP @@ -8581,7 +8581,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.2788E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP diff --git a/process/pfcoil.py b/process/pfcoil.py index 64976fecf4..e4e11209ad 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -114,7 +114,7 @@ def pfcoil(self): pfv.n_pf_cs_plasma_circuits = pfv.n_cs_pf_coils + 1 # Overall current density in the Central Solenoid at beginning of pulse - pfv.cohbop = pfv.coheof * pfv.fcohbop + pfv.j_cs_pulse_start = pfv.coheof * pfv.fcohbop # Set up array of times tv.tim[0] = 0.0e0 @@ -237,7 +237,7 @@ def pfcoil(self): # coils. # Flux swing coils: - if pfv.cohbop != 0.0e0: + if pfv.j_cs_pulse_start != 0.0e0: # Find currents for plasma initiation to null field across plasma npts = 32 # Number of test points across plasma midplane if npts > pfv.nptsmx: @@ -1036,9 +1036,11 @@ def ohcalc(self): pfv.areaoh = 2.0e0 * hohc * bv.dr_cs # Maximum current (MA-turns) in central Solenoid, at either BOP or EOF - if pfv.cohbop > pfv.coheof: + if pfv.j_cs_pulse_start > pfv.coheof: sgn = 1.0e0 - pfv.ric[pfv.n_cs_pf_coils - 1] = sgn * 1.0e-6 * pfv.cohbop * pfv.areaoh + pfv.ric[pfv.n_cs_pf_coils - 1] = ( + sgn * 1.0e-6 * pfv.j_cs_pulse_start * pfv.areaoh + ) else: sgn = -1.0e0 pfv.ric[pfv.n_cs_pf_coils - 1] = sgn * 1.0e-6 * pfv.coheof * pfv.areaoh @@ -1106,7 +1108,7 @@ def ohcalc(self): # Peak field at the Beginning-Of-Pulse (BOP) # Occurs at inner edge of coil; bmaxoh0 and bzi are of same sign at BOP pfv.bmaxoh0 = self.bfmax( - pfv.cohbop, + pfv.j_cs_pulse_start, pfv.r_pf_coil_inner[pfv.n_cs_pf_coils - 1], pfv.r_pf_coil_outer[pfv.n_cs_pf_coils - 1], hohc, @@ -1307,7 +1309,7 @@ def peakb(self, i, ii, it): # No Central Solenoid kk = 0 else: - sgn = 1.0 if pfv.cohbop > pfv.coheof else -1.0 + sgn = 1.0 if pfv.j_cs_pulse_start > pfv.coheof else -1.0 # Current in each filament representing part of the Central Solenoid for iohc in range(pf.nfxf): @@ -1569,7 +1571,7 @@ def hoop_stress(self, r): b_b = 0.0e0 # current density [A/m^2] - j = pfv.cohbop + j = pfv.j_cs_pulse_start # K term k = ((alpha * b_a - b_b) * j * a) / (alpha - 1.0e0) @@ -1998,8 +2000,8 @@ def outpf(self): op.ovarre( self.outfile, "Actual overall current density at BOP (A/m2)", - "(cohbop)", - pfv.cohbop, + "(j_cs_pulse_start)", + pfv.j_cs_pulse_start, "OP ", ) op.oblnkl(self.outfile) @@ -2270,7 +2272,10 @@ def outpf(self): # iteration variable(38) fjohc if ( abs(pfv.coheof) > 0.99e0 * abs(numerics.boundu[37] * pfv.rjohc) - ) or (abs(pfv.cohbop) > 0.99e0 * abs(numerics.boundu[38] * pfv.rjohc0)): + ) or ( + abs(pfv.j_cs_pulse_start) + > 0.99e0 * abs(numerics.boundu[38] * pfv.rjohc0) + ): pf.cslimit = True if pfv.temp_cs_margin < 1.01e0 * tfv.tmargmin_cs: pf.cslimit = True @@ -2545,12 +2550,12 @@ def outpf(self): # Issue #328 op.write( self.outfile, - f"CS\t\t{pfv.ric[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.rjpfalw[pfv.n_cs_pf_coils - 1]:.2e}\t{max(abs(pfv.cohbop), abs(pfv.coheof)):.2e}\t{max(abs(pfv.cohbop), abs(pfv.coheof)) / pfv.rjpfalw[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.bpf[pfv.n_cs_pf_coils - 1]:.2e}", + f"CS\t\t{pfv.ric[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.rjpfalw[pfv.n_cs_pf_coils - 1]:.2e}\t{max(abs(pfv.j_cs_pulse_start), abs(pfv.coheof)):.2e}\t{max(abs(pfv.j_cs_pulse_start), abs(pfv.coheof)) / pfv.rjpfalw[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.bpf[pfv.n_cs_pf_coils - 1]:.2e}", ) else: op.write( self.outfile, - f"CS\t\t{pfv.ric[pfv.n_cs_pf_coils - 1]:.2e}\t-1.0e0\t{max(abs(pfv.cohbop)):.2e}\t{abs(pfv.coheof):.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.bpf[pfv.n_cs_pf_coils - 1]:.2e}", + f"CS\t\t{pfv.ric[pfv.n_cs_pf_coils - 1]:.2e}\t-1.0e0\t{max(abs(pfv.j_cs_pulse_start)):.2e}\t{abs(pfv.coheof):.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.bpf[pfv.n_cs_pf_coils - 1]:.2e}", ) # Miscellaneous totals diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 0b26f099ff..f78b71d4ab 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1273,7 +1273,7 @@ def sctfcoil(self, output: bool): build_variables.dr_cs_tf_gap, pfcoil_variables.i_pf_conductor, pfcoil_variables.coheof, - pfcoil_variables.cohbop, + pfcoil_variables.j_cs_pulse_start, pfcoil_variables.cptdin, pfcoil_variables.n_pf_coils_in_group, pfcoil_variables.ld_ratio_cst, @@ -3588,7 +3588,7 @@ def stresscl( dr_cs_tf_gap, i_pf_conductor, coheof, - cohbop, + j_cs_pulse_start, cptdin, n_pf_coils_in_group, ld_ratio_cst, @@ -3785,7 +3785,7 @@ def stresscl( # Maximum current in Central Solenoid, at either BOP or EOF [MA-turns] # Absolute value - curr_oh_max = 1.0e-6 * np.maximum(coheof, cohbop) * a_oh + curr_oh_max = 1.0e-6 * np.maximum(coheof, j_cs_pulse_start) * a_oh # Number of turns n_oh_turns = 1.0e6 * curr_oh_max / cptdin[sum(n_pf_coils_in_group)] diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 03658d671d..9eb458e7e1 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -1387,9 +1387,9 @@ subroutine constraint_eqn_027(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! fjohc0 : input real : f-value for central solenoid current at beginning of pulse !! rjohc0 : input real : allowable central solenoid current density at beginning of pulse (A/m2) - !! cohbop : input real : central solenoid overall current density at beginning of pulse (A/m2) + !! j_cs_pulse_start : input real : central solenoid overall current density at beginning of pulse (A/m2) use constraint_variables, only: fjohc0 - use pfcoil_variables, only: rjohc0, cohbop + use pfcoil_variables, only: rjohc0, j_cs_pulse_start implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -1397,9 +1397,9 @@ subroutine constraint_eqn_027(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 - fjohc0 * rjohc0/cohbop + tmp_cc = 1.0D0 - fjohc0 * rjohc0/j_cs_pulse_start tmp_con = rjohc0 - tmp_err = rjohc0 - cohbop / fjohc0 + tmp_err = rjohc0 - j_cs_pulse_start / fjohc0 tmp_symbol = '<' tmp_units = 'A/m2' diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 6541d7f376..c273bcb4f9 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -71,7 +71,7 @@ module pfcoil_variables !! PF group current array, equilibrium current (MA) !! Input if i_pf_current=0, computed otherwise - real(dp) :: cohbop + real(dp) :: j_cs_pulse_start !! Central solenoid overall current density at beginning of pulse (A/m2) real(dp) :: coheof @@ -427,7 +427,7 @@ subroutine init_pfcoil_variables 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0/) ccls_ma = (/0.0D0, 0.0D0, 0.0D0, & 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0/) - cohbop = 0.0D0 + j_cs_pulse_start = 0.0D0 coheof = 1.85D7 c_pf_coil_turn = 0.0D0 cptdin = (/4.0D4, 4.0D4, 4.0D4, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 479c0c62d8..a2ee38af17 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -772,7 +772,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.9126E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index c8603ebf72..f279f3af9c 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -773,7 +773,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.9126E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 041b3860a2..066fabd336 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -773,7 +773,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.9126E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index ff987843f1..a3cc5ffd44 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -773,7 +773,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.9126E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index c3ddaf7885..d6f1a5d4f0 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -776,7 +776,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4872E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0462E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5137E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.9094E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9094E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3907E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6220E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0866E+08 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index a7f11eaa9f..d5361fc4f7 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -774,7 +774,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4743E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0423E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.6946E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.9874E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9874E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.4055E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.4875E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0463E+08 OP @@ -1937,7 +1937,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5050E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0515E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7013E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.9925E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9925E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.4012E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5259E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0578E+08 OP @@ -3100,7 +3100,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5107E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0532E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.6963E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.9893E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9893E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3990E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5459E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0638E+08 OP @@ -4263,7 +4263,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5119E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0536E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.6955E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.9892E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9892E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3987E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5486E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0646E+08 OP @@ -5426,7 +5426,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5139E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0542E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7157E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.9915E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9915E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.4030E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5102E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0531E+08 OP @@ -6589,7 +6589,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5564E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0669E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7694E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 2.0074E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0074E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.4019E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5201E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0560E+08 OP @@ -7752,7 +7752,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5690E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0707E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7792E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 2.0108E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0108E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.4010E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5281E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0584E+08 OP @@ -8915,7 +8915,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5698E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0709E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7701E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 2.0063E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0063E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.4004E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5337E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0601E+08 OP @@ -10078,7 +10078,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5786E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0736E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7684E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 2.0015E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0015E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3999E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5380E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0614E+08 OP @@ -11241,7 +11241,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5809E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0743E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7698E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 2.0013E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0013E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3998E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5386E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0616E+08 OP @@ -12404,7 +12404,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5563E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0669E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7541E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 2.0056E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0056E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.4002E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5351E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0605E+08 OP @@ -13567,7 +13567,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5397E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0619E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7385E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 2.0138E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0138E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3982E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5531E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0659E+08 OP @@ -14730,7 +14730,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5406E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0622E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7380E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 2.0137E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0137E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3980E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5550E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0665E+08 OP @@ -15893,7 +15893,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5452E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0636E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7355E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 2.0082E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0082E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3986E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5498E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0649E+08 OP @@ -17056,7 +17056,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5494E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0648E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7312E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 2.0034E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0034E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3987E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5491E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0647E+08 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index b4343d5b87..7f53287488 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -621,7 +621,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.2788E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP @@ -1616,7 +1616,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.2788E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP @@ -2611,7 +2611,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.2788E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP @@ -3606,7 +3606,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.2788E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP @@ -4601,7 +4601,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.2788E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP @@ -5596,7 +5596,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.2788E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP @@ -6591,7 +6591,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.2788E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP @@ -7586,7 +7586,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.2788E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP @@ -8581,7 +8581,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.2788E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 182884614b..dd1d3a77b5 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1467,7 +1467,7 @@ "coecap": 0.0, "coefuelt": 0.0, "coeoam": 0.0, - "cohbop": 0.0, + "j_cs_pulse_start": 0.0, "coheof": 18500000.0, "coldmass": 0.0, "comp": null, @@ -9130,7 +9130,7 @@ "coecap": "capital cost of electricity (m$/kW-hr)", "coefuelt": "'fuel' (including replaceable components) contribution to cost of electricity (m$/kW-hr)", "coeoam": "operation and maintenance contribution to cost of electricity (m$/kW-hr)", - "cohbop": "Central solenoid overall current density at beginning of pulse (A/m2)", + "j_cs_pulse_start": "Central solenoid overall current density at beginning of pulse (A/m2)", "coheof": "Central solenoid overall current density at end of flat-top (A/m2) (`iteration variable 37`) (`sweep variable 62`)", "coldmass": "total mass of components at cryogenic temperatures (kg)", "comp_eps": "", @@ -18935,7 +18935,7 @@ "bpf", "ccl0_ma", "ccls_ma", - "cohbop", + "j_cs_pulse_start", "coheof", "c_pf_coil_turn", "cptdin", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index c01d2ff66e..138585fdbc 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -109,7 +109,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "i_cs_superconductor", 1) monkeypatch.setattr(pfv, "m_pf_coil_conductor_total", 0.0) monkeypatch.setattr(pfv, "fcupfsu", 6.900e-1) - monkeypatch.setattr(pfv, "cohbop", 1.693e7) + monkeypatch.setattr(pfv, "j_cs_pulse_start", 1.693e7) monkeypatch.setattr(pfv, "rjpfalw", np.full(22, 0.0)) monkeypatch.setattr(pfv, "i_sup_pf_shape", 0) monkeypatch.setattr(pfv, "rref", np.full(10, 7.0)) @@ -226,7 +226,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "cptdin", np.full(22, 4.22e4)) monkeypatch.setattr(pfv, "pfcaseth", np.full(22, 0.0)) monkeypatch.setattr(pfv, "r_pf_coil_middle", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "cohbop", 1.693e7) + monkeypatch.setattr(pfv, "j_cs_pulse_start", 1.693e7) monkeypatch.setattr(pfv, "z_pf_coil_upper", np.full(22, 0.0)) monkeypatch.setattr(pfv, "m_pf_coil_conductor", np.full(22, 0.0)) monkeypatch.setattr(pfv, "z_pf_coil_lower", np.full(22, 0.0)) @@ -2510,7 +2510,7 @@ def test_peakb(monkeypatch: pytest.MonkeyPatch, pfcoil: PFCoil): 0, ]), ) - monkeypatch.setattr(pfv, "cohbop", 19311657.760000002) + monkeypatch.setattr(pfv, "j_cs_pulse_start", 19311657.760000002) monkeypatch.setattr( pfv, "z_pf_coil_upper", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index f7c82b4d38..8b7ed3238d 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1765,7 +1765,7 @@ i_pf_conductor = 0 *icc = 27 * DESCRIPTION: Constraint equation for CS current density upper limit at BOP * JUSTIFICATION: Turned off, dont care about CS current density limit -* VARIABLES: cohbop calculated in-situ +* VARIABLES: j_cs_pulse_start calculated in-situ *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 53f8682253..586f2831a4 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -776,7 +776,7 @@ Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4872E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0462E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5137E+07 OP - Actual_overall_current_density_at_BOP_(A/m2)____________________________ (cohbop)______________________ 1.9094E+07 OP + Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9094E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3907E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6220E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0866E+08 OP diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index 5526b14946..3b14e96dc5 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1978,7 +1978,7 @@ def test_hoop_stress(pfcoil, monkeypatch): """ monkeypatch.setattr(pfv, "oh_steel_frac", 0.57874999999999999) monkeypatch.setattr(pfv, "bmaxoh0", 13.522197474024983) - monkeypatch.setattr(pfv, "cohbop", 19311657.760000002) + monkeypatch.setattr(pfv, "j_cs_pulse_start", 19311657.760000002) monkeypatch.setattr(pfv, "n_cs_pf_coils", 7) monkeypatch.setattr( pfv, diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 8b580bd6dd..0a9b545c10 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -3579,7 +3579,7 @@ class StressclParam(NamedTuple): coheof: Any = None - cohbop: Any = None + j_cs_pulse_start: Any = None n_pf_coils_in_group: Any = None @@ -3701,7 +3701,7 @@ class StressclParam(NamedTuple): oh_steel_frac=0.57874999999999999, ohhghf=0.90000000000000002, coheof=20726000, - cohbop=0, + j_cs_pulse_start=0, n_pf_coils_in_group=np.array( np.array((1, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0), order="F"), order="F" ).transpose(), @@ -3824,7 +3824,7 @@ class StressclParam(NamedTuple): oh_steel_frac=0.57874999999999999, ohhghf=0.90000000000000002, coheof=20726000, - cohbop=19311657.760000002, + j_cs_pulse_start=19311657.760000002, n_pf_coils_in_group=np.array( np.array((1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0), order="F"), order="F" ).transpose(), @@ -3948,7 +3948,7 @@ def test_stresscl(stressclparam, monkeypatch, sctfcoil): stressclparam.dr_cs_tf_gap, stressclparam.i_pf_conductor, stressclparam.coheof, - stressclparam.cohbop, + stressclparam.j_cs_pulse_start, stressclparam.cptdin, stressclparam.n_pf_coils_in_group, 70 / 22, From 2eca507628db3090ab2ad2afeb1ae358e838aa1d Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 15:18:05 +0000 Subject: [PATCH 27/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'ohhghf'=20to=20'?= =?UTF-8?q?f=5Fz=5Fcs=5Ftf=5Finternal'=20across=20multiple=20files=20for?= =?UTF-8?q?=20consistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/pf-coil.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 4 +-- examples/data/large_tokamak_1_MFILE.DAT | 4 +-- examples/data/large_tokamak_2_MFILE.DAT | 4 +-- examples/data/large_tokamak_3_MFILE.DAT | 4 +-- examples/data/large_tokamak_4_MFILE.DAT | 4 +-- examples/data/large_tokamak_IN.DAT | 2 +- examples/data/scan_MFILE.DAT | 20 +++++------ examples/data/scan_example_file_IN.DAT | 2 +- process/build.py | 4 +-- process/io/plot_radial_build.py | 2 +- process/io/plot_scans.py | 2 +- process/io/variable_metadata.py | 2 +- process/pfcoil.py | 34 ++++++++++++------- process/sctfcoil.py | 8 ++--- source/fortran/input.f90 | 6 ++-- source/fortran/pfcoil_variables.f90 | 4 +-- source/fortran/scan.f90 | 2 +- source/fortran/stellarator.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 4 +-- .../data/large_tokamak_2_MFILE.DAT | 4 +-- .../data/large_tokamak_3_MFILE.DAT | 4 +-- .../data/large_tokamak_4_MFILE.DAT | 4 +-- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +-- .../data/large_tokamak_once_through.IN.DAT | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 32 ++++++++--------- tests/integration/data/scan_MFILE.DAT | 20 +++++------ .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 12 +++---- tests/integration/test_pfcoil_int.py | 6 ++-- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +-- tests/unit/test_sctfcoil.py | 8 ++--- 40 files changed, 122 insertions(+), 114 deletions(-) diff --git a/documentation/proc-pages/eng-models/pf-coil.md b/documentation/proc-pages/eng-models/pf-coil.md index e081e2c5ad..cc73b1ee46 100644 --- a/documentation/proc-pages/eng-models/pf-coil.md +++ b/documentation/proc-pages/eng-models/pf-coil.md @@ -29,7 +29,7 @@ into account `i_single_null` and other recent changes e.g. rclsnorm) `i_pf_location(j)` = 1: PF coils are placed above the central solenoid (one group only); *R* = `r_cs_middle` + `rpf1`
      -*Z* = $\pm$(`hmax` * `ohhghf` + 0.1 + 0.5 * (`hmax` * (1 - `ohhghf`) + `dr_tf_inboard` + 0.1)) +*Z* = $\pm$(`hmax` * `f_z_cs_tf_internal` + 0.1 + 0.5 * (`hmax` * (1 - `f_z_cs_tf_internal`) + `dr_tf_inboard` + 0.1)) `i_pf_location(j)` = 2: PF coils are placed above the TF coils (one group only);
      *R* = `rmajor` + `rpf2`
      diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index b73db2fc18..c5106dc082 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -605,7 +605,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -1749,7 +1749,7 @@ n_pf_coils_in_group = 1,1,2,2 n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height -ohhghf = 0.9 +f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 277921980b..27bb75d98b 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -602,7 +602,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -1743,7 +1743,7 @@ n_pf_coils_in_group = 1,1,2,2 n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height -ohhghf = 0.9 +f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 994622e387..fc60017163 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -602,7 +602,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -1743,7 +1743,7 @@ n_pf_coils_in_group = 1,1,2,2 n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height -ohhghf = 0.9 +f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index ecc44d337c..a1bfda0d67 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -602,7 +602,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -1744,7 +1744,7 @@ n_pf_coils_in_group = 1,1,2,2 n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height -ohhghf = 0.9 +f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 56ab06a9cb..1257330c50 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -602,7 +602,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -1744,7 +1744,7 @@ n_pf_coils_in_group = 1,1,2,2 n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height -ohhghf = 0.9 +f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index bc76ea2fa6..3011ef0453 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -554,7 +554,7 @@ n_pf_coils_in_group = 1,1,2,2 n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height -ohhghf = 0.9 +f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index dc245ac1ba..de6cfc6e71 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -455,7 +455,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 7.6976E+00 @@ -1450,7 +1450,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 7.6976E+00 @@ -2445,7 +2445,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 7.6976E+00 @@ -3440,7 +3440,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 7.6976E+00 @@ -4435,7 +4435,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 7.6976E+00 @@ -5430,7 +5430,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 7.6976E+00 @@ -6425,7 +6425,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 7.6976E+00 @@ -7420,7 +7420,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 7.6976E+00 @@ -8415,7 +8415,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 7.6976E+00 @@ -9209,7 +9209,7 @@ i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j n_pf_coil_groups = 4 * Number of groups of pf coils; -ohhghf = 0.9 * Central solenoid height / tf coil internal height +f_z_cs_tf_internal = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 21f13ac777..16d650a229 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -554,7 +554,7 @@ n_pf_coils_in_group = 1,1,2,2 n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height -ohhghf = 0.9 +f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 diff --git a/process/build.py b/process/build.py index a3408093e8..ac633ae4b3 100644 --- a/process/build.py +++ b/process/build.py @@ -701,8 +701,8 @@ def calculate_vertical_build(self, output: bool) -> None: po.ovarre( self.mfile, "Ratio of Central Solenoid height to TF coil internal height", - "(ohhghf)", - pfcoil_variables.ohhghf, + "(f_z_cs_tf_internal)", + pfcoil_variables.f_z_cs_tf_internal, ) po.ocmmnt( self.outfile, diff --git a/process/io/plot_radial_build.py b/process/io/plot_radial_build.py index 3b877ee20d..d94a7b5a51 100644 --- a/process/io/plot_radial_build.py +++ b/process/io/plot_radial_build.py @@ -211,7 +211,7 @@ def main(args=None): "copperaoh_m2_max", "coheof", "dr_cs", - "ohhghf", + "f_z_cs_tf_internal", "csfv.n_cycle_min", "pfv.oh_steel_frac", "csfv.t_crack_vertical", diff --git a/process/io/plot_scans.py b/process/io/plot_scans.py index 5415165a3d..4a34658de6 100644 --- a/process/io/plot_scans.py +++ b/process/io/plot_scans.py @@ -259,7 +259,7 @@ def main(args=None): 61: "copperaoh_m2_max", 62: "coheof", 63: "dr_cs", - 64: "ohhghf", + 64: "f_z_cs_tf_internal", 65: "csfv.n_cycle_min", 66: "pfv.oh_steel_frac", 67: "csfv.t_crack_vertical", diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index b125b59b7b..f93b398401 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -220,7 +220,7 @@ class VariableMetadata: description="central solenoid overall current density at end of flat-top", units="A m^{-2}", ), - "ohhghf": VariableMetadata( + "f_z_cs_tf_internal": VariableMetadata( latex=r"$Thickness_{\mathrm{CS}}[m]$", description="Central solenoid height / TF coil internal height", units="m", diff --git a/process/pfcoil.py b/process/pfcoil.py index e4e11209ad..67a6c4ba79 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -139,7 +139,7 @@ def pfcoil(self): pf.nfxf = 2 * pfv.nfxfh # total Central Solenoid current at EOF - ioheof = -bv.hmax * pfv.ohhghf * bv.dr_cs * 2.0e0 * pfv.coheof + ioheof = -bv.hmax * pfv.f_z_cs_tf_internal * bv.dr_cs * 2.0e0 * pfv.coheof if pf.nfxf > pfv.nfixmx: eh.idiags[0] = pf.nfxf @@ -151,7 +151,9 @@ def pfcoil(self): for nng in range(pfv.nfxfh): pf.rfxf[nng] = pfv.r_cs_middle pf.rfxf[nng + pfv.nfxfh] = pf.rfxf[nng] - pf.zfxf[nng] = bv.hmax * pfv.ohhghf / pfv.nfxfh * ((nng + 1) - 0.5e0) + pf.zfxf[nng] = ( + bv.hmax * pfv.f_z_cs_tf_internal / pfv.nfxfh * ((nng + 1) - 0.5e0) + ) pf.zfxf[nng + pfv.nfxfh] = -pf.zfxf[nng] pf.cfxf[nng] = -ioheof / pf.nfxf * pfv.fcohbop pf.cfxf[nng + pfv.nfxfh] = pf.cfxf[nng] @@ -173,10 +175,14 @@ def pfcoil(self): # Z coordinate of coil enforced so as not # to occupy the same space as the Central Solenoid pf.zcls[j, k] = signn[k] * ( - bv.hmax * pfv.ohhghf + bv.hmax * pfv.f_z_cs_tf_internal + 0.1e0 + 0.5e0 - * (bv.hmax * (1.0e0 - pfv.ohhghf) + bv.dr_tf_inboard + 0.1e0) + * ( + bv.hmax * (1.0e0 - pfv.f_z_cs_tf_internal) + + bv.dr_tf_inboard + + 0.1e0 + ) ) elif pfv.i_pf_location[j] == 2: @@ -463,7 +469,7 @@ def pfcoil(self): + (bv.dr_cs * bv.dr_cs) / 6.0e0 + (bv.dr_cs * bv.dr_bore) / 2.0e0 ) - / (bv.hmax * pfv.ohhghf * 2.0e0) + / (bv.hmax * pfv.f_z_cs_tf_internal * 2.0e0) ) dics = csflux / ddics @@ -534,7 +540,9 @@ def pfcoil(self): # PF coil is stacked on top of the Central Solenoid dx = 0.5e0 * bv.dr_cs dz = 0.5e0 * ( - bv.hmax * (1.0e0 - pfv.ohhghf) + bv.dr_tf_inboard + 0.1e0 + bv.hmax * (1.0e0 - pfv.f_z_cs_tf_internal) + + bv.dr_tf_inboard + + 0.1e0 ) # ??? area = 4.0e0 * dx * dz * pfv.pf_current_safety_factor @@ -1012,7 +1020,7 @@ def ohcalc(self): author: P J Knight, CCFE, Culham Science Centre """ - hohc = bv.hmax * pfv.ohhghf + hohc = bv.hmax * pfv.f_z_cs_tf_internal # Z coordinates of coil edges pfv.z_pf_coil_upper[pfv.n_cs_pf_coils - 1] = hohc @@ -1318,7 +1326,7 @@ def peakb(self, i, ii, it): * pfv.coheof * sgn * bv.dr_cs - * pfv.ohhghf + * pfv.f_z_cs_tf_internal * bv.hmax / pf.nfxf * 2.0e0 @@ -2913,7 +2921,7 @@ def superconpf( j_crit_cable = j_crit_sc * (1.0e0 - fcu) * (1.0e0 - fhe) # The CS coil current at EOF - # ioheof = bv.hmax * pfv.ohhghf * bv.dr_cs * 2.0 * pfv.coheof + # ioheof = bv.hmax * pfv.f_z_cs_tf_internal * bv.dr_cs * 2.0 * pfv.coheof # The CS coil current/copper area calculation for quench protection # Copper area = (area of coil - area of steel)*(1- void fraction)* # (fraction of copper in strands) @@ -2930,7 +2938,7 @@ def superconpf( j_crit_cable = j_crit_sc * (1.0e0 - fcu) * (1.0e0 - fhe) # The CS coil current at EOF - # ioheof = bv.hmax * pfv.ohhghf * bv.dr_cs * 2.0 * pfv.coheof + # ioheof = bv.hmax * pfv.f_z_cs_tf_internal * bv.dr_cs * 2.0 * pfv.coheof elif isumat == 8: # Durham Ginzburg-Landau critical surface model for REBCO @@ -2944,7 +2952,7 @@ def superconpf( j_crit_cable = j_crit_sc * (1.0e0 - fcu) * (1.0e0 - fhe) # The CS coil current at EOF - # ioheof = bv.hmax * pfv.ohhghf * bv.dr_cs * 2.0 * pfv.coheof + # ioheof = bv.hmax * pfv.f_z_cs_tf_internal * bv.dr_cs * 2.0 * pfv.coheof # The CS coil current/copper area calculation for quench protection # rcv.copperaoh_m2 = ioheof / (pfv.awpoh * (1.0 - pfv.vfohc) * pfv.fcuohsu) @@ -2960,7 +2968,7 @@ def superconpf( j_crit_cable = j_crit_sc * (1.0e0 - fcu) * (1.0e0 - fhe) # The CS coil current at EOF - # ioheof = bv.hmax * pfv.ohhghf * bv.dr_cs * 2.0 * pfv.coheof + # ioheof = bv.hmax * pfv.f_z_cs_tf_internal * bv.dr_cs * 2.0 * pfv.coheof # The CS coil current/copper area calculation for quench protection # rcv.copperaoh_m2 = ioheof / (pfv.awpoh * (1.0 - pfv.vfohc) * pfv.fcuohsu) @@ -2973,7 +2981,7 @@ def superconpf( # and only calculated if the CS properties are needed. if bv.iohcl != 0: # CS coil current at EOF - ioheof = bv.hmax * pfv.ohhghf * bv.dr_cs * 2.0 * pfv.coheof + ioheof = bv.hmax * pfv.f_z_cs_tf_internal * bv.dr_cs * 2.0 * pfv.coheof # CS coil current/copper area calculation for quench protection rcv.copperaoh_m2 = ioheof / ( pfv.awpoh * (1.0 - pfv.vfohc) * pfv.fcuohsu diff --git a/process/sctfcoil.py b/process/sctfcoil.py index f78b71d4ab..47a4a376b8 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1266,7 +1266,7 @@ def sctfcoil(self, output: bool): float(build_variables.r_tf_inboard_in), build_variables.dr_bore, build_variables.hmax, - pfcoil_variables.ohhghf, + pfcoil_variables.f_z_cs_tf_internal, build_variables.dr_cs, build_variables.tf_in_cs, build_variables.dr_tf_inboard, @@ -3581,7 +3581,7 @@ def stresscl( r_tf_inboard_in, dr_bore, hmax, - ohhghf, + f_z_cs_tf_internal, dr_cs, tf_in_cs, dr_tf_inboard, @@ -3779,9 +3779,9 @@ def stresscl( # CS vertical cross-section area [m2] if tf_in_cs == 1: - a_oh = 2.0e0 * hmax * ohhghf * (dr_bore - dr_tf_inboard) + a_oh = 2.0e0 * hmax * f_z_cs_tf_internal * (dr_bore - dr_tf_inboard) else: - a_oh = 2.0e0 * hmax * ohhghf * dr_cs + a_oh = 2.0e0 * hmax * f_z_cs_tf_internal * dr_cs # Maximum current in Central Solenoid, at either BOP or EOF [MA-turns] # Absolute value diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 64fe7fafa0..3882ad8d7c 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -297,7 +297,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) epsvmc, ftol, ipnvars, ioptimz, nineqns, ipeqns, boundu, icc, ipnfoms, name_xc use pfcoil_variables, only: rhopfbus, rjconpf, zref, fcuohsu, oh_steel_frac, vf, & coheof, sigpfcalw, alstroh, i_pf_conductor, fcupfsu, fvssu, etapsu, i_cs_stress, & - fbmaxcs, ngc, rpf2, fcohbop, ohhghf, vfohc, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & + fbmaxcs, ngc, rpf2, fcohbop, f_z_cs_tf_internal, vfohc, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & n_pf_coil_groups, i_pf_superconductor, nfxfh, alfapf, routr, sigpfcf, rho_pf_coil, bmaxcs_lim, & n_pf_coils_in_group, nfixmx, cptdin, i_pf_location, i_sup_pf_shape, rref, i_pf_current, & ccl0_ma, ccls_ma, ld_ratio_cst @@ -1879,8 +1879,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('n_pf_coil_groups') call parse_int_variable('n_pf_coil_groups', n_pf_coil_groups, 0, n_pf_groups_max, & 'No of groups of PF coils') - case ('ohhghf') - call parse_real_variable('ohhghf', ohhghf, 0.0D0, 2.0D0, & + case ('f_z_cs_tf_internal') + call parse_real_variable('f_z_cs_tf_internal', f_z_cs_tf_internal, 0.0D0, 2.0D0, & 'Central Solenoid height / TF coil height') case ('rho_pf_coil') call parse_real_variable('rho_pf_coil', rho_pf_coil, 0.0D0, 1.0D-4, & diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index c273bcb4f9..2cf3ed2fbc 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -214,7 +214,7 @@ module pfcoil_variables integer :: n_cs_pf_coils !! number of PF coils (excluding the central solenoid) + 1 - real(dp) :: ohhghf + real(dp) :: f_z_cs_tf_internal !! Central solenoid height / TF coil internal height real(dp) :: oh_steel_frac @@ -461,7 +461,7 @@ subroutine init_pfcoil_variables nfxfh = 7 n_pf_coil_groups = 3 n_cs_pf_coils = 0 - ohhghf = 0.71D0 + f_z_cs_tf_internal = 0.71D0 oh_steel_frac = 0.5D0 pf_current_safety_factor = 1.0D0 pfcaseth = 0.0D0 diff --git a/source/fortran/scan.f90 b/source/fortran/scan.f90 index 957befaf45..4cbf0cd29d 100644 --- a/source/fortran/scan.f90 +++ b/source/fortran/scan.f90 @@ -99,7 +99,7 @@ module scan_module !!
    • 61 copperaoh_m2_max : CS coil current / copper area !!
    • 62 coheof : CS coil current density at EOF !!
    • 63 dr_cs : CS thickness (m) - !!
    • 64 ohhghf : CS height (m) + !!
    • 64 f_z_cs_tf_internal : CS height (m) !!
    • 65 n_cycle_min : Minimum cycles for CS stress model constraint 90 !!
    • 66 oh_steel_frac: Steel fraction in CS coil !!
    • 67 t_crack_vertical: Initial crack vertical dimension (m)
    diff --git a/source/fortran/stellarator.f90 b/source/fortran/stellarator.f90 index 73b493717b..0cea8f82dc 100644 --- a/source/fortran/stellarator.f90 +++ b/source/fortran/stellarator.f90 @@ -53,7 +53,7 @@ subroutine stinit use build_variables, only: dr_cs_tf_gap, iohcl, dr_cs, tfootfi use current_drive_variables, only: irfcd - use pfcoil_variables, only: ohhghf + use pfcoil_variables, only: f_z_cs_tf_internal use physics_variables, only: aspect, beta_norm_max, kappa, kappa95, q95, rmajor, & triang, hfac, labels_confinement_scalings use numerics, only: boundl, boundu @@ -92,7 +92,7 @@ subroutine stinit dr_cs = 0.0D0 iohcl = 0 - ohhghf = 0.0D0 + f_z_cs_tf_internal = 0.0D0 dr_cs_tf_gap = 0.0D0 tfootfi = 1.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index a2ee38af17..6f9b1c017c 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -601,7 +601,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -1742,7 +1742,7 @@ n_pf_coils_in_group = 1,1,2,2 n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height -ohhghf = 0.9 +f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index f279f3af9c..6c748df7a4 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -602,7 +602,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -1743,7 +1743,7 @@ n_pf_coils_in_group = 1,1,2,2 n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height -ohhghf = 0.9 +f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 066fabd336..4713718362 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -602,7 +602,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -1743,7 +1743,7 @@ n_pf_coils_in_group = 1,1,2,2 n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height -ohhghf = 0.9 +f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index a3cc5ffd44..56019c2391 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -602,7 +602,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -1743,7 +1743,7 @@ n_pf_coils_in_group = 1,1,2,2 n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height -ohhghf = 0.9 +f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index a55fa7aecd..8651f4f668 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -553,7 +553,7 @@ n_pf_coils_in_group = 1,1,2,2 n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height -ohhghf = 0.9 +f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index d6f1a5d4f0..47ab9fe964 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -600,7 +600,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(excludes_structure)_(m)____________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_Solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_Solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -1744,7 +1744,7 @@ n_pf_coils_in_group = 1,1,2,2 n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height -ohhghf = 0.9 +f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index ea7e98b14b..cc85197e96 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -288,7 +288,7 @@ i_cs_superconductor = 1 * switch for superconductor material in central solenoid i_pf_superconductor = 3 * switch for superconductor material in PF coils; n_pf_coils_in_group = 1,1,2,2 * number of PF coils in group j n_pf_coil_groups = 4 * number of groups of PF coils; Symmetric coil pairs should all be in the same group -ohhghf = 0.9 * Central solenoid height / TF coil internal height +f_z_cs_tf_internal = 0.9 * Central solenoid height / TF coil internal height oh_steel_frac = 0.4856940627014451 * central solenoid steel fraction (`iteration variable 122`) rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * average winding pack current density of PF coil i (A/m2) at time of peak rpf2 = -1.825 * offset (m) of radial position of `i_pf_location=2` PF coils from being at diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 6222785002..88e5755b60 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -230,7 +230,7 @@ i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j n_pf_coil_groups = 4 * Number of groups of pf coils; -ohhghf = 0.9 * Central solenoid height / tf coil internal height +f_z_cs_tf_internal = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index d5361fc4f7..08515c1f9d 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -603,7 +603,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -1766,7 +1766,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -2929,7 +2929,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -4092,7 +4092,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -5255,7 +5255,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -6418,7 +6418,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -7581,7 +7581,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -8744,7 +8744,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -9907,7 +9907,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -11070,7 +11070,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -12233,7 +12233,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -13396,7 +13396,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -14559,7 +14559,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -15722,7 +15722,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -16885,7 +16885,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -18030,7 +18030,7 @@ n_pf_coils_in_group = 1,1,2,2 n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height -ohhghf = 0.9 +f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 7f53287488..1b272908a9 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -455,7 +455,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 7.6976E+00 @@ -1450,7 +1450,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 7.6976E+00 @@ -2445,7 +2445,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 7.6976E+00 @@ -3440,7 +3440,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 7.6976E+00 @@ -4435,7 +4435,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 7.6976E+00 @@ -5430,7 +5430,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 7.6976E+00 @@ -6425,7 +6425,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 7.6976E+00 @@ -7420,7 +7420,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 7.6976E+00 @@ -8415,7 +8415,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 7.6976E+00 @@ -9209,7 +9209,7 @@ i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j n_pf_coil_groups = 4 * Number of groups of pf coils; -ohhghf = 0.9 * Central solenoid height / tf coil internal height +f_z_cs_tf_internal = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index f327ee1a6c..30d39270a6 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -230,7 +230,7 @@ i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j n_pf_coil_groups = 4 * Number of groups of pf coils; -ohhghf = 0.9 * Central solenoid height / tf coil internal height +f_z_cs_tf_internal = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index da2405226c..c1e774fd4b 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -230,7 +230,7 @@ i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j n_pf_coil_groups = 4 * Number of groups of pf coils; -ohhghf = 0.9 * Central solenoid height / tf coil internal height +f_z_cs_tf_internal = 0.9 * Central solenoid height / tf coil internal height rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index dd1d3a77b5..71b753af42 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3449,7 +3449,7 @@ "ofile": 0.0, "oh_steel_frac": 0.5, "dr_cs": 0.811, - "ohhghf": 0.71, + "f_z_cs_tf_internal": 0.71, "om": null, "omegan": 1.0, "omlarg": 0.0, @@ -10192,7 +10192,7 @@ "nre": "", "nsix": "", "nsixi": "", - "nsweep": "Switch denoting quantity to scan:
      \n
    • 1 aspect\n
    • 2 hldivlim\n
    • 3 pnetelin\n
    • 4 hfact\n
    • 5 oacdcp\n
    • 6 walalw\n
    • 7 beamfus0\n
    • 8 fqval\n
    • 9 te\n
    • 10 boundu(15: fvs)\n
    • 11 beta_norm_max\n
    • 12 bootstrap_current_fraction_max (use negative values only)\n
    • 13 boundu(10: hfact)\n
    • 14 fiooic\n
    • 15 fjprot\n
    • 16 rmajor\n
    • 17 bmxlim\n
    • 18 gammax\n
    • 19 boundl(16: dr_cs)\n
    • 20 t_burn_min\n
    • 21 not used\n
    • 22 cfactr (N.B. requires iavail=0)\n
    • 23 boundu(72: fipir)\n
    • 24 powfmax\n
    • 25 kappa\n
    • 26 triang\n
    • 27 tbrmin (for blktmodel > 0 only)\n
    • 28 bt\n
    • 29 coreradius\n
    • 31 f_alpha_energy_confinement_min\n
    • 32 epsvmc\n
    • 33 ttarget\n
    • 34 qtargettotal\n
    • 35 lambda_q_omp\n
    • 36 lambda_target\n
    • 37 lcon_factor\n
    • 38 Neon upper limit\n
    • 39 Argon upper limit\n
    • 40 Xenon upper limit\n
    • 41 dr_blkt_outboard\n
    • 42 Argon fraction fimp(9)\n
    • 43 normalised minor radius at which electron cyclotron current drive is maximum\n
    • 44 Allowable maximum shear stress (Tresca) in tf coil structural material\n
    • 45 Minimum allowable temperature margin ; tf coils\n
    • 46 boundu(150) fgwsep\n
    • 47 impurity_enrichment(9) Argon impurity enrichment\n
    • 48 TF coil - n_pancake (integer turn winding pack)\n
    • 49 TF coil - n_layer (integer turn winding pack)\n
    • 50 Xenon fraction fimp(13)\n
    • 51 Power fraction to lower DN Divertor ftar\n
    • 52 SoL radiation fraction\n
    • 54 GL_nbti upper critical field at 0 Kelvin\n
    • 55 `dr_shld_inboard` : Inboard neutron shield thickness\n
    • 56 crypmw_max: Maximum cryogenic power (ixx=164, ixc=87)\n
    • 57 `bt` lower boundary\n
    • 58 `dr_fw_plasma_gap_inboard` : Inboard plasma-first wall gap\n
    • 59 `dr_fw_plasma_gap_outboard` : Outboard plasma-first wall gap\n
    • 60 sig_tf_wp_max: Allowable stress in TF Coil conduit (Tresca)\n
    • 61 copperaoh_m2_max : CS coil current / copper area\n
    • 62 coheof : CS coil current density at EOF\n
    • 63 dr_cs : CS thickness (m)\n
    • 64 ohhghf : CS height (m)
    ", + "nsweep": "Switch denoting quantity to scan:
      \n
    • 1 aspect\n
    • 2 hldivlim\n
    • 3 pnetelin\n
    • 4 hfact\n
    • 5 oacdcp\n
    • 6 walalw\n
    • 7 beamfus0\n
    • 8 fqval\n
    • 9 te\n
    • 10 boundu(15: fvs)\n
    • 11 beta_norm_max\n
    • 12 bootstrap_current_fraction_max (use negative values only)\n
    • 13 boundu(10: hfact)\n
    • 14 fiooic\n
    • 15 fjprot\n
    • 16 rmajor\n
    • 17 bmxlim\n
    • 18 gammax\n
    • 19 boundl(16: dr_cs)\n
    • 20 t_burn_min\n
    • 21 not used\n
    • 22 cfactr (N.B. requires iavail=0)\n
    • 23 boundu(72: fipir)\n
    • 24 powfmax\n
    • 25 kappa\n
    • 26 triang\n
    • 27 tbrmin (for blktmodel > 0 only)\n
    • 28 bt\n
    • 29 coreradius\n
    • 31 f_alpha_energy_confinement_min\n
    • 32 epsvmc\n
    • 33 ttarget\n
    • 34 qtargettotal\n
    • 35 lambda_q_omp\n
    • 36 lambda_target\n
    • 37 lcon_factor\n
    • 38 Neon upper limit\n
    • 39 Argon upper limit\n
    • 40 Xenon upper limit\n
    • 41 dr_blkt_outboard\n
    • 42 Argon fraction fimp(9)\n
    • 43 normalised minor radius at which electron cyclotron current drive is maximum\n
    • 44 Allowable maximum shear stress (Tresca) in tf coil structural material\n
    • 45 Minimum allowable temperature margin ; tf coils\n
    • 46 boundu(150) fgwsep\n
    • 47 impurity_enrichment(9) Argon impurity enrichment\n
    • 48 TF coil - n_pancake (integer turn winding pack)\n
    • 49 TF coil - n_layer (integer turn winding pack)\n
    • 50 Xenon fraction fimp(13)\n
    • 51 Power fraction to lower DN Divertor ftar\n
    • 52 SoL radiation fraction\n
    • 54 GL_nbti upper critical field at 0 Kelvin\n
    • 55 `dr_shld_inboard` : Inboard neutron shield thickness\n
    • 56 crypmw_max: Maximum cryogenic power (ixx=164, ixc=87)\n
    • 57 `bt` lower boundary\n
    • 58 `dr_fw_plasma_gap_inboard` : Inboard plasma-first wall gap\n
    • 59 `dr_fw_plasma_gap_outboard` : Outboard plasma-first wall gap\n
    • 60 sig_tf_wp_max: Allowable stress in TF Coil conduit (Tresca)\n
    • 61 copperaoh_m2_max : CS coil current / copper area\n
    • 62 coheof : CS coil current density at EOF\n
    • 63 dr_cs : CS thickness (m)\n
    • 64 f_z_cs_tf_internal : CS height (m)
    ", "nsweep_2": "nsweep_2 /3/ : switch denoting quantity to scan for 2D scan:", "nt": "", "ntype": "switch for vacuum pump type:\n
      \n
    • =0 - for turbomolecular pump (magnetic bearing) with speed of 2.0 m3/s\n (1.95 for N2, 1.8 for He, 1.8 for DT)
      • \n
    • =1 - for compound cryopump with nominal speed of 10.0 m3/s\n (9.0 for N2, 5.0 for He and 25.0 for DT)
      • \n
    ", @@ -10208,7 +10208,7 @@ "ofile": "", "oh_steel_frac": "central solenoid steel fraction (`iteration variable 122`)", "dr_cs": "Central solenoid thickness (m) (`iteration variable 16`)", - "ohhghf": "Central solenoid height / TF coil internal height", + "f_z_cs_tf_internal": "Central solenoid height / TF coil internal height", "om": "", "omegan": "pressure ratio (nT)_plasma / (nT)_scrape-off", "omlarg": "power spillage to private flux factor", @@ -13825,7 +13825,7 @@ "lb": 0.0, "ub": 10.0 }, - "ohhghf": { + "f_z_cs_tf_internal": { "lb": 0.0, "ub": 2.0 }, @@ -18964,7 +18964,7 @@ "nfxfh", "n_pf_coil_groups", "n_cs_pf_coils", - "ohhghf", + "f_z_cs_tf_internal", "oh_steel_frac", "pfcaseth", "rho_pf_coil", @@ -20583,7 +20583,7 @@ "oacdcp": "real_variable", "oh_steel_frac": "real_variable", "dr_cs": "real_variable", - "ohhghf": "real_variable", + "f_z_cs_tf_internal": "real_variable", "omegan": "real_variable", "outgasfactor": "real_variable", "outgasindex": "real_variable", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 138585fdbc..02c3f7a829 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -73,7 +73,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "pfcaseth", np.full(22, 0.0)) monkeypatch.setattr(pfv, "itr_sum", 0.0) monkeypatch.setattr(pfv, "sigpfcf", 6.66e-1) - monkeypatch.setattr(pfv, "ohhghf", 9.0e-1) + monkeypatch.setattr(pfv, "f_z_cs_tf_internal", 9.0e-1) monkeypatch.setattr(pfv, "i_pf_location", np.array([2, 2, 3, 3, 0, 0, 0, 0, 0, 0])) monkeypatch.setattr(pfv, "m_pf_coil_structure", np.full(22, 0.0)) monkeypatch.setattr(pfv, "powpfres", 0.0) @@ -200,7 +200,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "jcableoh_bop", 1.069e8) monkeypatch.setattr(pfv, "fcuohsu", 7.000e-1) monkeypatch.setattr(pfv, "i_cs_superconductor", 5) - monkeypatch.setattr(pfv, "ohhghf", 0.9) + monkeypatch.setattr(pfv, "f_z_cs_tf_internal", 0.9) monkeypatch.setattr(pfv, "areaoh", 1.039e1) monkeypatch.setattr(pfv, "powpfres", 0.0) monkeypatch.setattr(pfv, "jcableoh_eof", 1.427e8) @@ -2276,7 +2276,7 @@ def test_peakb(monkeypatch: pytest.MonkeyPatch, pfcoil: PFCoil): 0, ]), ) - monkeypatch.setattr(pfv, "ohhghf", 0.90000000000000002) + monkeypatch.setattr(pfv, "f_z_cs_tf_internal", 0.90000000000000002) monkeypatch.setattr( pfv, "r_pf_coil_outer", diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index df6b9a1543..451ed4bbf3 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -553,7 +553,7 @@ n_pf_coils_in_group = 1,1,2,2 n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height -ohhghf = 0.9 +f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 26c3423e11..069d75af55 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -535,7 +535,7 @@ n_pf_coils_in_group = 1,1,2,2 n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height -ohhghf = 0.9 +f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index 4592c471c2..9acf7b144e 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -288,7 +288,7 @@ i_cs_superconductor = 1 * switch for superconductor material in central solenoid i_pf_superconductor = 3 * switch for superconductor material in PF coils; n_pf_coils_in_group = 1,1,2,2 * number of PF coils in group j n_pf_coil_groups = 4 * number of groups of PF coils; Symmetric coil pairs should all be in the same group -ohhghf = 0.9 * Central solenoid height / TF coil internal height +f_z_cs_tf_internal = 0.9 * Central solenoid height / TF coil internal height oh_steel_frac = 0.4856940627014451 * central solenoid steel fraction (`iteration variable 122`) rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * average winding pack current density of PF coil i (A/m2) at time of peak rpf2 = -1.825 * offset (m) of radial position of `i_pf_location=2` PF coils from being at diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 8b7ed3238d..5cbd5fe2ca 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1661,7 +1661,7 @@ i_pf_conductor = 0 * Geometry * *----------* -*ohhghf = +*f_z_cs_tf_internal = * DESCRIPTION: Central solenoid height / TF coil internal height (default = 0.71) * JUSTIFICATION: Not yet set. diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 7e2bcb3a70..bedd9c3b9f 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -554,7 +554,7 @@ n_pf_coils_in_group = 1,1,2,2 n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height -ohhghf = 0.9 +f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 586f2831a4..b218aaac0b 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -600,7 +600,7 @@ Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 External_cryostat_thickness_(excludes_structure)_(m)____________________ (dr_cryostat)_______________________ 1.5000E-01 - Ratio_of_Central_Solenoid_height_to_TF_coil_internal_height_____________ (ohhghf)______________________ 9.0000E-01 + Ratio_of_Central_Solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 # Divertor build and plasma position # Plasma_top_position,_radial_(m)_________________________________________ (ptop_radial)_________________ 6.6667E+00 @@ -1745,7 +1745,7 @@ n_pf_coils_in_group = 1,1,2,2 n_pf_coil_groups = 4 * Central solenoid height / TF coil internal height -ohhghf = 0.9 +f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 0a9b545c10..88ca6f9747 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -3575,7 +3575,7 @@ class StressclParam(NamedTuple): oh_steel_frac: Any = None - ohhghf: Any = None + f_z_cs_tf_internal: Any = None coheof: Any = None @@ -3699,7 +3699,7 @@ class StressclParam(NamedTuple): n_tf_wp_layers=5, i_pf_conductor=0, oh_steel_frac=0.57874999999999999, - ohhghf=0.90000000000000002, + f_z_cs_tf_internal=0.90000000000000002, coheof=20726000, j_cs_pulse_start=0, n_pf_coils_in_group=np.array( @@ -3822,7 +3822,7 @@ class StressclParam(NamedTuple): n_tf_wp_layers=5, i_pf_conductor=0, oh_steel_frac=0.57874999999999999, - ohhghf=0.90000000000000002, + f_z_cs_tf_internal=0.90000000000000002, coheof=20726000, j_cs_pulse_start=19311657.760000002, n_pf_coils_in_group=np.array( @@ -3941,7 +3941,7 @@ def test_stresscl(stressclparam, monkeypatch, sctfcoil): stressclparam.r_tf_inboard_in, stressclparam.dr_bore, stressclparam.hmax, - stressclparam.ohhghf, + stressclparam.f_z_cs_tf_internal, stressclparam.dr_cs, stressclparam.tf_in_cs, stressclparam.dr_tf_inboard, From 27cd1266bde67c37f536fd5d9a2b4446897008d8 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 15:23:38 +0000 Subject: [PATCH 28/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'areaoh'=20to=20'?= =?UTF-8?q?a=5Fcs=5Fpoloidal'=20across=20multiple=20files=20for=20consiste?= =?UTF-8?q?ncy=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 4 +- examples/data/large_tokamak_1_MFILE.DAT | 4 +- examples/data/large_tokamak_2_MFILE.DAT | 4 +- examples/data/large_tokamak_3_MFILE.DAT | 4 +- examples/data/large_tokamak_4_MFILE.DAT | 4 +- examples/data/scan_MFILE.DAT | 36 +++++------ process/pfcoil.py | 28 +++++---- source/fortran/pfcoil_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 4 +- .../data/large_tokamak_2_MFILE.DAT | 4 +- .../data/large_tokamak_3_MFILE.DAT | 4 +- .../data/large_tokamak_4_MFILE.DAT | 4 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +- tests/integration/data/scan_2D_MFILE.DAT | 60 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 36 +++++------ tests/integration/ref_dicts.json | 6 +- tests/integration/test_pfcoil_int.py | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +- 18 files changed, 109 insertions(+), 107 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index c5106dc082..b9c5abb1f9 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -787,11 +787,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0588E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.5551E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 8.8176E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.8176E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.1169E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 2.8819E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.2351E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.7006E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7006E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.3310E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 27bb75d98b..da110765da 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -782,11 +782,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 9.1407E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1407E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3996E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.7411E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index fc60017163..20d7bc3924 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -782,11 +782,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 9.1407E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1407E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3996E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.7411E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index a1bfda0d67..2033201dc3 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -782,11 +782,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 9.1407E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1407E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3996E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.7411E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 1257330c50..1cf0f44f67 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -782,11 +782,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 9.1407E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1407E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3996E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.7411E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index de6cfc6e71..9a5fed1bb3 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -630,11 +630,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 1.1774E+01 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 3.9748E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 @@ -1625,11 +1625,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 1.1774E+01 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 3.9748E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 @@ -2620,11 +2620,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 1.1774E+01 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 3.9748E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 @@ -3615,11 +3615,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 1.1774E+01 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 3.9748E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 @@ -4610,11 +4610,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 1.1774E+01 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 3.9748E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 @@ -5605,11 +5605,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 1.1774E+01 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 3.9748E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 @@ -6600,11 +6600,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 1.1774E+01 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 3.9748E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 @@ -7595,11 +7595,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 1.1774E+01 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 3.9748E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 @@ -8590,11 +8590,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 1.1774E+01 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 3.9748E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 diff --git a/process/pfcoil.py b/process/pfcoil.py index 67a6c4ba79..20f79b03fe 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1041,17 +1041,19 @@ def ohcalc(self): ) # Total cross-sectional area - pfv.areaoh = 2.0e0 * hohc * bv.dr_cs + pfv.a_cs_poloidal = 2.0e0 * hohc * bv.dr_cs # Maximum current (MA-turns) in central Solenoid, at either BOP or EOF if pfv.j_cs_pulse_start > pfv.coheof: sgn = 1.0e0 pfv.ric[pfv.n_cs_pf_coils - 1] = ( - sgn * 1.0e-6 * pfv.j_cs_pulse_start * pfv.areaoh + sgn * 1.0e-6 * pfv.j_cs_pulse_start * pfv.a_cs_poloidal ) else: sgn = -1.0e0 - pfv.ric[pfv.n_cs_pf_coils - 1] = sgn * 1.0e-6 * pfv.coheof * pfv.areaoh + pfv.ric[pfv.n_cs_pf_coils - 1] = ( + sgn * 1.0e-6 * pfv.coheof * pfv.a_cs_poloidal + ) # Number of turns pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1] = ( @@ -1061,7 +1063,7 @@ def ohcalc(self): ) # Turn vertical cross-sectionnal area - pfv.a_oh_turn = pfv.areaoh / pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1] + pfv.a_oh_turn = pfv.a_cs_poloidal / pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1] # Depth/width of cs turn conduit pfv.d_cond_cst = (pfv.a_oh_turn / pfv.ld_ratio_cst) ** 0.5 @@ -1159,7 +1161,7 @@ def ohcalc(self): # equation is used for Central Solenoid stress # Area of steel in Central Solenoid - areaspf = pfv.oh_steel_frac * pfv.areaoh + areaspf = pfv.oh_steel_frac * pfv.a_cs_poloidal if pfv.i_cs_stress == 1: pfv.s_tresca_oh = max( @@ -1193,7 +1195,7 @@ def ohcalc(self): ) # Non-steel cross-sectional area - pfv.awpoh = pfv.areaoh - areaspf + pfv.awpoh = pfv.a_cs_poloidal - areaspf # Issue #97. Fudge to ensure awpoh is positive; result is continuous, smooth and # monotonically decreases @@ -1245,7 +1247,7 @@ def ohcalc(self): else: pfv.j_crit_str_cs = pfv.jscoh_eof * (1 - pfv.fcuohsu) - pfv.rjohc = jcritwp * pfv.awpoh / pfv.areaoh + pfv.rjohc = jcritwp * pfv.awpoh / pfv.a_cs_poloidal # Allowable coil overall current density at BOP @@ -1262,7 +1264,7 @@ def ohcalc(self): tfv.tcritsc, ) - pfv.rjpfalw[pfv.n_cs_pf_coils - 1] = jcritwp * pfv.awpoh / pfv.areaoh + pfv.rjpfalw[pfv.n_cs_pf_coils - 1] = jcritwp * pfv.awpoh / pfv.a_cs_poloidal pfv.rjohc0 = pfv.rjpfalw[pfv.n_cs_pf_coils - 1] pfv.temp_cs_margin = min(tmarg1, tmarg2) @@ -1275,7 +1277,7 @@ def ohcalc(self): * constants.pi * pfv.r_cs_middle * pfv.rho_pf_coil - / (pfv.areaoh * (1.0e0 - pfv.vfohc)) + / (pfv.a_cs_poloidal * (1.0e0 - pfv.vfohc)) * (1.0e6 * pfv.ric[pfv.n_cs_pf_coils - 1]) ** 2 ) pfv.powpfres = pfv.powpfres + pfv.powohres @@ -2060,8 +2062,8 @@ def outpf(self): op.ovarre( self.outfile, "CS overall cross-sectional area (m2)", - "(areaoh)", - pfv.areaoh, + "(a_cs_poloidal)", + pfv.a_cs_poloidal, "OP ", ) op.ovarre( @@ -2088,8 +2090,8 @@ def outpf(self): op.ovarre( self.outfile, "CS steel cross-sectional area (m2)", - "(areaoh-awpoh)", - pfv.areaoh - pfv.awpoh, + "(a_cs_poloidal-awpoh)", + pfv.a_cs_poloidal - pfv.awpoh, "OP ", ) op.ovarre( diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 2cf3ed2fbc..a83e85a113 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -45,7 +45,7 @@ module pfcoil_variables !! - =0 Hoop stress only !! - =1 Hoop + Axial stress - real(dp) :: areaoh + real(dp) :: a_cs_poloidal !! Central solenoid vertical cross-sectional area (m2) real(dp) :: a_oh_turn @@ -417,7 +417,7 @@ subroutine init_pfcoil_variables alfapf = 5.0D-10 alstroh = 4.0D8 i_cs_stress = 0 - areaoh = 0.0D0 + a_cs_poloidal = 0.0D0 a_oh_turn = 0.0D0 awpoh = 0.0D0 bmaxoh = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 6f9b1c017c..78f8d26415 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -781,11 +781,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 9.1407E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1407E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3996E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.7411E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 6c748df7a4..7b7f09dde0 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -782,11 +782,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 9.1407E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1407E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3996E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.7411E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 4713718362..3048e1d2ab 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -782,11 +782,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 9.1407E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1407E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3996E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.7411E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 56019c2391..5fe3d1ed80 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -782,11 +782,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 9.1407E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1407E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3996E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.7411E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 47ab9fe964..e5b78e5af1 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -785,11 +785,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9704E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7696E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 9.1580E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1580E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3942E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0759E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3182E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.7639E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7639E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.2019E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 08515c1f9d..5656b8a709 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -783,11 +783,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0486E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.5540E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 8.8157E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.8157E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.4641E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.1249E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3392E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.3516E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3516E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9362E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 @@ -1946,11 +1946,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0684E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.5277E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 8.7740E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.7740E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.4122E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0885E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3236E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.3618E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3618E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9713E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 @@ -3109,11 +3109,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0815E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.5352E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 8.7859E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.7859E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.4050E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0835E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3215E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.3809E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3809E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9863E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 @@ -4272,11 +4272,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0802E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.5349E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 8.7854E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.7854E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.4021E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0815E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3206E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.3832E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3832E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9892E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 @@ -5435,11 +5435,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0685E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.5266E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 8.7723E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.7723E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.4171E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0920E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3251E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.3552E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3552E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9647E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 @@ -6598,11 +6598,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0572E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4639E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 8.6728E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6728E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3772E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0641E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3132E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.2955E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.2955E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9529E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 @@ -7761,11 +7761,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0569E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4494E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 8.6497E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6497E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3615E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0530E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3084E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.2882E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.2882E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9576E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 @@ -8924,11 +8924,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0708E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4622E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 8.6700E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6700E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3602E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0522E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3081E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.3098E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3098E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9709E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 @@ -10087,11 +10087,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0841E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4724E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 8.6862E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6862E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3557E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0490E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3067E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.3305E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3305E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9855E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 @@ -11250,11 +11250,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0834E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4720E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 8.6857E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6857E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3543E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0480E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3063E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.3314E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3314E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 @@ -12413,11 +12413,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0691E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4697E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 8.6819E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6819E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3642E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0549E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3092E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.3178E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3178E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9733E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 @@ -13576,11 +13576,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0559E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4537E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 8.6566E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6566E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3537E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0476E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3061E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.3029E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3029E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9706E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 @@ -14739,11 +14739,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0549E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4535E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 8.6562E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6562E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3519E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0463E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3056E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.3043E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3043E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9725E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 @@ -15902,11 +15902,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0688E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4673E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 8.6782E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6782E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3542E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0480E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3063E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.3239E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3239E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9826E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 @@ -17065,11 +17065,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0828E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4798E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 8.6980E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6980E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3540E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0478E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3062E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.3439E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3439E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9942E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 1b272908a9..ea2493e887 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -630,11 +630,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 1.1774E+01 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 3.9748E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 @@ -1625,11 +1625,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 1.1774E+01 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 3.9748E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 @@ -2620,11 +2620,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 1.1774E+01 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 3.9748E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 @@ -3615,11 +3615,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 1.1774E+01 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 3.9748E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 @@ -4610,11 +4610,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 1.1774E+01 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 3.9748E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 @@ -5605,11 +5605,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 1.1774E+01 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 3.9748E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 @@ -6600,11 +6600,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 1.1774E+01 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 3.9748E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 @@ -7595,11 +7595,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 1.1774E+01 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 3.9748E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 @@ -8590,11 +8590,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 1.1774E+01 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 3.9748E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 71b753af42..966b9fb16d 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -258,7 +258,7 @@ "area_omp": 0.0, "area_target": 0.0, "a_tf_leg_outboard": 0.0, - "areaoh": 0.0, + "a_cs_poloidal": 0.0, "armour_density": 0.0, "armour_fw_bl_mass": 0.0, "aspect": 2.907, @@ -8828,7 +8828,7 @@ "area_omp": "", "area_target": "", "a_tf_leg_outboard": "outboard TF leg area (m2)", - "areaoh": "Central solenoid vertical cross-sectional area (m2)", + "a_cs_poloidal": "Central solenoid vertical cross-sectional area (m2)", "armour_density": "FW armour density [kg/m3]", "armour_fw_bl_mass": "Total mass of armour, first wall and blanket (kg)", "aspect": "aspect ratio (`iteration variable 1`)", @@ -18927,7 +18927,7 @@ "alfapf", "alstroh", "i_cs_stress", - "areaoh", + "a_cs_poloidal", "a_oh_turn", "awpoh", "bmaxoh", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 02c3f7a829..8d375b6676 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -201,7 +201,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "fcuohsu", 7.000e-1) monkeypatch.setattr(pfv, "i_cs_superconductor", 5) monkeypatch.setattr(pfv, "f_z_cs_tf_internal", 0.9) - monkeypatch.setattr(pfv, "areaoh", 1.039e1) + monkeypatch.setattr(pfv, "a_cs_poloidal", 1.039e1) monkeypatch.setattr(pfv, "powpfres", 0.0) monkeypatch.setattr(pfv, "jcableoh_eof", 1.427e8) monkeypatch.setattr(pfv, "powohres", 0.0) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index b218aaac0b..6cea827924 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -785,11 +785,11 @@ CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9704E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7696E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 - CS_overall_cross-sectional_area_(m2)____________________________________ (areaoh)______________________ 9.1580E+00 OP + CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1580E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3942E+00 OP ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0759E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3182E+00 OP - CS_steel_cross-sectional_area_(m2)______________________________________ (areaoh-awpoh)________________ 4.7639E+00 OP + CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7639E+00 OP CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.2019E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 From f3bb0592f9cdc84da7f44493d2bca7e3da757c19 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 15:26:24 +0000 Subject: [PATCH 29/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'coheof'=20to=20'?= =?UTF-8?q?j=5Fcs=5Fflat=5Ftop=5Fend'=20across=20multiple=20files=20for=20?= =?UTF-8?q?consistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/central-solenoid.md | 4 +- .../data/csv_output_large_tokamak_MFILE.DAT | 6 +-- examples/data/large_tokamak_1_MFILE.DAT | 6 +-- examples/data/large_tokamak_2_MFILE.DAT | 6 +-- examples/data/large_tokamak_3_MFILE.DAT | 6 +-- examples/data/large_tokamak_4_MFILE.DAT | 6 +-- examples/data/large_tokamak_IN.DAT | 4 +- examples/data/scan_MFILE.DAT | 24 +++++----- examples/data/scan_example_file_IN.DAT | 4 +- process/io/plot_radial_build.py | 2 +- process/io/plot_scans.py | 2 +- process/io/variable_metadata.py | 2 +- process/pfcoil.py | 47 ++++++++++++------- process/sctfcoil.py | 8 ++-- source/fortran/constraint_equations.f90 | 8 ++-- source/fortran/input.f90 | 6 +-- source/fortran/iteration_variables.f90 | 12 ++--- source/fortran/numerics.f90 | 2 +- source/fortran/output.f90 | 2 +- source/fortran/pfcoil_variables.f90 | 4 +- source/fortran/scan.f90 | 2 +- .../data/large_tokamak_1_MFILE.DAT | 6 +-- .../data/large_tokamak_2_MFILE.DAT | 6 +-- .../data/large_tokamak_3_MFILE.DAT | 6 +-- .../data/large_tokamak_4_MFILE.DAT | 6 +-- tests/integration/data/large_tokamak_IN.DAT | 4 +- .../integration/data/large_tokamak_MFILE.DAT | 6 +-- .../data/large_tokamak_once_through.IN.DAT | 4 +- tests/integration/data/ref_IN.DAT | 6 +-- tests/integration/data/scan_2D_MFILE.DAT | 34 +++++++------- tests/integration/data/scan_MFILE.DAT | 24 +++++----- .../data/uncertainties_nonopt_ref_IN.DAT | 6 +-- .../integration/data/uncertainties_ref_IN.DAT | 6 +-- tests/integration/ref_dicts.json | 28 +++++------ tests/integration/test_pfcoil_int.py | 6 +-- .../input_files/large_tokamak.IN.DAT | 4 +- .../input_files/large_tokamak_nof.IN.DAT | 4 +- .../large_tokamak_once_through.IN.DAT | 4 +- .../input_files/st_regression.IN.DAT | 4 +- tests/unit/data/large_tokamak_IN.DAT | 4 +- tests/unit/data/large_tokamak_MFILE.DAT | 6 +-- tests/unit/test_sctfcoil.py | 8 ++-- 42 files changed, 180 insertions(+), 165 deletions(-) diff --git a/documentation/proc-pages/eng-models/central-solenoid.md b/documentation/proc-pages/eng-models/central-solenoid.md index 516168c934..10010fb78d 100644 --- a/documentation/proc-pages/eng-models/central-solenoid.md +++ b/documentation/proc-pages/eng-models/central-solenoid.md @@ -146,9 +146,9 @@ The central solenoid pre-compression structure is included in the model if and o ## Current density inputs and limits -The absolute value of the central solenoid current density at the end-of-flat-top ('EOF'), `coheof`, +The absolute value of the central solenoid current density at the end-of-flat-top ('EOF'), `j_cs_flat_top_end`, is specified by the user, and can be used as an iteration variable (no. 37). The current density at -the beginning-of-pulse ('BOP' - See Figure 1) is specified as a (positive) fraction of `coheof` +the beginning-of-pulse ('BOP' - See Figure 1) is specified as a (positive) fraction of `j_cs_flat_top_end` using `fcohbop` (iteration variable no. 41). The current density in the CS at all other times is calculated by taking into account the flux swing necessary to initiate and maintain plasma current. diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index b9c5abb1f9..374ceedebc 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -783,7 +783,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 4.2900E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.2870E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 4.2063E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.0066E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0066E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0588E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.5551E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -1296,10 +1296,10 @@ bmxlim = 14.0 * Central solenoid EOF current density upper limit * *--------------------------------------------------* icc = 26 -ixc = 37 * coheof [A/m2] +ixc = 37 * j_cs_flat_top_end [A/m2] ixc = 38 * fjohc boundu(38) = 1.0 -coheof = 1.5E7 +j_cs_flat_top_end = 1.5E7 fjohc = 0.6 * Central solenoid BOP current density upper limit * diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index da110765da..92faab9666 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -778,7 +778,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.0264E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -1291,10 +1291,10 @@ bmxlim = 14.0 * Central solenoid EOF current density upper limit * *--------------------------------------------------* icc = 26 -ixc = 37 * coheof [A/m2] +ixc = 37 * j_cs_flat_top_end [A/m2] ixc = 38 * fjohc boundu(38) = 1.0 -coheof = 1.5E7 +j_cs_flat_top_end = 1.5E7 fjohc = 0.6 * Central solenoid BOP current density upper limit * diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 20d7bc3924..18a967f01c 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -778,7 +778,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.0264E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -1291,10 +1291,10 @@ bmxlim = 14.0 * Central solenoid EOF current density upper limit * *--------------------------------------------------* icc = 26 -ixc = 37 * coheof [A/m2] +ixc = 37 * j_cs_flat_top_end [A/m2] ixc = 38 * fjohc boundu(38) = 1.0 -coheof = 1.5E7 +j_cs_flat_top_end = 1.5E7 fjohc = 0.6 * Central solenoid BOP current density upper limit * diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 2033201dc3..f04b085518 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -778,7 +778,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.0264E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -1291,10 +1291,10 @@ bmxlim = 14.0 * Central solenoid EOF current density upper limit * *--------------------------------------------------* icc = 26 -ixc = 37 * coheof [A/m2] +ixc = 37 * j_cs_flat_top_end [A/m2] ixc = 38 * fjohc boundu(38) = 1.0 -coheof = 1.5E7 +j_cs_flat_top_end = 1.5E7 fjohc = 0.6 * Central solenoid BOP current density upper limit * diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 1cf0f44f67..9ee74247d8 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -778,7 +778,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.0264E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -1291,10 +1291,10 @@ bmxlim = 14.0 * Central solenoid EOF current density upper limit * *--------------------------------------------------* icc = 26 -ixc = 37 * coheof [A/m2] +ixc = 37 * j_cs_flat_top_end [A/m2] ixc = 38 * fjohc boundu(38) = 1.0 -coheof = 1.5E7 +j_cs_flat_top_end = 1.5E7 fjohc = 0.6 * Central solenoid BOP current density upper limit * diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 3011ef0453..aa89599874 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -103,10 +103,10 @@ bmxlim = 14.0 * Central solenoid EOF current density upper limit * *--------------------------------------------------* icc = 26 -ixc = 37 * coheof [A/m2] +ixc = 37 * j_cs_flat_top_end [A/m2] ixc = 38 * fjohc boundu(38) = 1.0 -coheof = 1.5E7 +j_cs_flat_top_end = 1.5E7 fjohc = 0.6 * Central solenoid BOP current density upper limit * diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 9a5fed1bb3..4e21becf16 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -626,7 +626,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 1.2788E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV @@ -1621,7 +1621,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 1.2788E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV @@ -2616,7 +2616,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 1.2788E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV @@ -3611,7 +3611,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 1.2788E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV @@ -4606,7 +4606,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 1.2788E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV @@ -5601,7 +5601,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 1.2788E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV @@ -6596,7 +6596,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 1.2788E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV @@ -7591,7 +7591,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 1.2788E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV @@ -8586,7 +8586,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 1.2788E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV @@ -9024,7 +9024,7 @@ boundl(18) = 3.5 ixc = 29 * dr_bore boundl(29) = 0.1 ixc = 36 * fbeta_max -ixc = 37 * coheof +ixc = 37 * j_cs_flat_top_end ixc = 38 * fjohc boundu(38) = 1.0 ixc = 39 * fjohc0 @@ -9202,7 +9202,7 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon *-----------------Pfcoil Variables-----------------* -coheof = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) +j_cs_flat_top_end = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; @@ -9326,7 +9326,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) q95 = 3.5000E+00 dr_bore = 2.3322E+00 fbeta_max = 4.8251E-01 - coheof = 2.0726E+07 + j_cs_flat_top_end = 2.0726E+07 fjohc = 5.7941E-01 fjohc0 = 5.3923E-01 fcohbop = 9.3176E-01 diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 16d650a229..b760f10f23 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -103,10 +103,10 @@ bmxlim = 14.0 * Central solenoid EOF current density upper limit * *--------------------------------------------------* icc = 26 -ixc = 37 * coheof [A/m2] +ixc = 37 * j_cs_flat_top_end [A/m2] ixc = 38 * fjohc boundu(38) = 1.0 -coheof = 1.5E7 +j_cs_flat_top_end = 1.5E7 fjohc = 0.6 * Central solenoid BOP current density upper limit * diff --git a/process/io/plot_radial_build.py b/process/io/plot_radial_build.py index d94a7b5a51..83bcf4dea4 100644 --- a/process/io/plot_radial_build.py +++ b/process/io/plot_radial_build.py @@ -209,7 +209,7 @@ def main(args=None): "dr_fw_plasma_gap_outboard", "sig_tf_wp_max", "copperaoh_m2_max", - "coheof", + "j_cs_flat_top_end", "dr_cs", "f_z_cs_tf_internal", "csfv.n_cycle_min", diff --git a/process/io/plot_scans.py b/process/io/plot_scans.py index 4a34658de6..b7d882d243 100644 --- a/process/io/plot_scans.py +++ b/process/io/plot_scans.py @@ -257,7 +257,7 @@ def main(args=None): 59: "dr_fw_plasma_gap_outboard", 60: "sig_tf_wp_max", 61: "copperaoh_m2_max", - 62: "coheof", + 62: "j_cs_flat_top_end", 63: "dr_cs", 64: "f_z_cs_tf_internal", 65: "csfv.n_cycle_min", diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index f93b398401..c33c613cfe 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -215,7 +215,7 @@ class VariableMetadata: description="Copper fraction of strand in central solenoid", units="", ), - "coheof": VariableMetadata( + "j_cs_flat_top_end": VariableMetadata( latex=r"$J [A m^{-2}]$", description="central solenoid overall current density at end of flat-top", units="A m^{-2}", diff --git a/process/pfcoil.py b/process/pfcoil.py index 20f79b03fe..baa052eeec 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -114,7 +114,7 @@ def pfcoil(self): pfv.n_pf_cs_plasma_circuits = pfv.n_cs_pf_coils + 1 # Overall current density in the Central Solenoid at beginning of pulse - pfv.j_cs_pulse_start = pfv.coheof * pfv.fcohbop + pfv.j_cs_pulse_start = pfv.j_cs_flat_top_end * pfv.fcohbop # Set up array of times tv.tim[0] = 0.0e0 @@ -139,7 +139,13 @@ def pfcoil(self): pf.nfxf = 2 * pfv.nfxfh # total Central Solenoid current at EOF - ioheof = -bv.hmax * pfv.f_z_cs_tf_internal * bv.dr_cs * 2.0e0 * pfv.coheof + ioheof = ( + -bv.hmax + * pfv.f_z_cs_tf_internal + * bv.dr_cs + * 2.0e0 + * pfv.j_cs_flat_top_end + ) if pf.nfxf > pfv.nfixmx: eh.idiags[0] = pf.nfxf @@ -1044,7 +1050,7 @@ def ohcalc(self): pfv.a_cs_poloidal = 2.0e0 * hohc * bv.dr_cs # Maximum current (MA-turns) in central Solenoid, at either BOP or EOF - if pfv.j_cs_pulse_start > pfv.coheof: + if pfv.j_cs_pulse_start > pfv.j_cs_flat_top_end: sgn = 1.0e0 pfv.ric[pfv.n_cs_pf_coils - 1] = ( sgn * 1.0e-6 * pfv.j_cs_pulse_start * pfv.a_cs_poloidal @@ -1052,7 +1058,7 @@ def ohcalc(self): else: sgn = -1.0e0 pfv.ric[pfv.n_cs_pf_coils - 1] = ( - sgn * 1.0e-6 * pfv.coheof * pfv.a_cs_poloidal + sgn * 1.0e-6 * pfv.j_cs_flat_top_end * pfv.a_cs_poloidal ) # Number of turns @@ -1099,7 +1105,7 @@ def ohcalc(self): # Peak field due to central Solenoid itself bmaxoh2 = self.bfmax( - pfv.coheof, + pfv.j_cs_flat_top_end, pfv.r_pf_coil_inner[pfv.n_cs_pf_coils - 1], pfv.r_pf_coil_outer[pfv.n_cs_pf_coils - 1], hohc, @@ -1319,13 +1325,13 @@ def peakb(self, i, ii, it): # No Central Solenoid kk = 0 else: - sgn = 1.0 if pfv.j_cs_pulse_start > pfv.coheof else -1.0 + sgn = 1.0 if pfv.j_cs_pulse_start > pfv.j_cs_flat_top_end else -1.0 # Current in each filament representing part of the Central Solenoid for iohc in range(pf.nfxf): pf.cfxf[iohc] = ( pfv.waves[pfv.n_cs_pf_coils - 1, it - 1] - * pfv.coheof + * pfv.j_cs_flat_top_end * sgn * bv.dr_cs * pfv.f_z_cs_tf_internal @@ -2046,8 +2052,8 @@ def outpf(self): op.ovarre( self.outfile, "Actual overall current density at EOF (A/m2)", - "(coheof)", - pfv.coheof, + "(j_cs_flat_top_end)", + pfv.j_cs_flat_top_end, ) op.oblnkl(self.outfile) # MDK add bv.dr_cs, bv.dr_bore and bv.dr_cs_tf_gap as they can be iteration variables @@ -2281,7 +2287,8 @@ def outpf(self): # iteration variable (39) fjohc0 # iteration variable(38) fjohc if ( - abs(pfv.coheof) > 0.99e0 * abs(numerics.boundu[37] * pfv.rjohc) + abs(pfv.j_cs_flat_top_end) + > 0.99e0 * abs(numerics.boundu[37] * pfv.rjohc) ) or ( abs(pfv.j_cs_pulse_start) > 0.99e0 * abs(numerics.boundu[38] * pfv.rjohc0) @@ -2560,12 +2567,12 @@ def outpf(self): # Issue #328 op.write( self.outfile, - f"CS\t\t{pfv.ric[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.rjpfalw[pfv.n_cs_pf_coils - 1]:.2e}\t{max(abs(pfv.j_cs_pulse_start), abs(pfv.coheof)):.2e}\t{max(abs(pfv.j_cs_pulse_start), abs(pfv.coheof)) / pfv.rjpfalw[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.bpf[pfv.n_cs_pf_coils - 1]:.2e}", + f"CS\t\t{pfv.ric[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.rjpfalw[pfv.n_cs_pf_coils - 1]:.2e}\t{max(abs(pfv.j_cs_pulse_start), abs(pfv.j_cs_flat_top_end)):.2e}\t{max(abs(pfv.j_cs_pulse_start), abs(pfv.j_cs_flat_top_end)) / pfv.rjpfalw[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.bpf[pfv.n_cs_pf_coils - 1]:.2e}", ) else: op.write( self.outfile, - f"CS\t\t{pfv.ric[pfv.n_cs_pf_coils - 1]:.2e}\t-1.0e0\t{max(abs(pfv.j_cs_pulse_start)):.2e}\t{abs(pfv.coheof):.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.bpf[pfv.n_cs_pf_coils - 1]:.2e}", + f"CS\t\t{pfv.ric[pfv.n_cs_pf_coils - 1]:.2e}\t-1.0e0\t{max(abs(pfv.j_cs_pulse_start)):.2e}\t{abs(pfv.j_cs_flat_top_end):.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.bpf[pfv.n_cs_pf_coils - 1]:.2e}", ) # Miscellaneous totals @@ -2923,7 +2930,7 @@ def superconpf( j_crit_cable = j_crit_sc * (1.0e0 - fcu) * (1.0e0 - fhe) # The CS coil current at EOF - # ioheof = bv.hmax * pfv.f_z_cs_tf_internal * bv.dr_cs * 2.0 * pfv.coheof + # ioheof = bv.hmax * pfv.f_z_cs_tf_internal * bv.dr_cs * 2.0 * pfv.j_cs_flat_top_end # The CS coil current/copper area calculation for quench protection # Copper area = (area of coil - area of steel)*(1- void fraction)* # (fraction of copper in strands) @@ -2940,7 +2947,7 @@ def superconpf( j_crit_cable = j_crit_sc * (1.0e0 - fcu) * (1.0e0 - fhe) # The CS coil current at EOF - # ioheof = bv.hmax * pfv.f_z_cs_tf_internal * bv.dr_cs * 2.0 * pfv.coheof + # ioheof = bv.hmax * pfv.f_z_cs_tf_internal * bv.dr_cs * 2.0 * pfv.j_cs_flat_top_end elif isumat == 8: # Durham Ginzburg-Landau critical surface model for REBCO @@ -2954,7 +2961,7 @@ def superconpf( j_crit_cable = j_crit_sc * (1.0e0 - fcu) * (1.0e0 - fhe) # The CS coil current at EOF - # ioheof = bv.hmax * pfv.f_z_cs_tf_internal * bv.dr_cs * 2.0 * pfv.coheof + # ioheof = bv.hmax * pfv.f_z_cs_tf_internal * bv.dr_cs * 2.0 * pfv.j_cs_flat_top_end # The CS coil current/copper area calculation for quench protection # rcv.copperaoh_m2 = ioheof / (pfv.awpoh * (1.0 - pfv.vfohc) * pfv.fcuohsu) @@ -2970,7 +2977,7 @@ def superconpf( j_crit_cable = j_crit_sc * (1.0e0 - fcu) * (1.0e0 - fhe) # The CS coil current at EOF - # ioheof = bv.hmax * pfv.f_z_cs_tf_internal * bv.dr_cs * 2.0 * pfv.coheof + # ioheof = bv.hmax * pfv.f_z_cs_tf_internal * bv.dr_cs * 2.0 * pfv.j_cs_flat_top_end # The CS coil current/copper area calculation for quench protection # rcv.copperaoh_m2 = ioheof / (pfv.awpoh * (1.0 - pfv.vfohc) * pfv.fcuohsu) @@ -2983,7 +2990,13 @@ def superconpf( # and only calculated if the CS properties are needed. if bv.iohcl != 0: # CS coil current at EOF - ioheof = bv.hmax * pfv.f_z_cs_tf_internal * bv.dr_cs * 2.0 * pfv.coheof + ioheof = ( + bv.hmax + * pfv.f_z_cs_tf_internal + * bv.dr_cs + * 2.0 + * pfv.j_cs_flat_top_end + ) # CS coil current/copper area calculation for quench protection rcv.copperaoh_m2 = ioheof / ( pfv.awpoh * (1.0 - pfv.vfohc) * pfv.fcuohsu diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 47a4a376b8..2b9a2069e3 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1272,7 +1272,7 @@ def sctfcoil(self, output: bool): build_variables.dr_tf_inboard, build_variables.dr_cs_tf_gap, pfcoil_variables.i_pf_conductor, - pfcoil_variables.coheof, + pfcoil_variables.j_cs_flat_top_end, pfcoil_variables.j_cs_pulse_start, pfcoil_variables.cptdin, pfcoil_variables.n_pf_coils_in_group, @@ -3587,7 +3587,7 @@ def stresscl( dr_tf_inboard, dr_cs_tf_gap, i_pf_conductor, - coheof, + j_cs_flat_top_end, j_cs_pulse_start, cptdin, n_pf_coils_in_group, @@ -3785,7 +3785,9 @@ def stresscl( # Maximum current in Central Solenoid, at either BOP or EOF [MA-turns] # Absolute value - curr_oh_max = 1.0e-6 * np.maximum(coheof, j_cs_pulse_start) * a_oh + curr_oh_max = ( + 1.0e-6 * np.maximum(j_cs_flat_top_end, j_cs_pulse_start) * a_oh + ) # Number of turns n_oh_turns = 1.0e6 * curr_oh_max / cptdin[sum(n_pf_coils_in_group)] diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 9eb458e7e1..bf0bc91390 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -1357,9 +1357,9 @@ subroutine constraint_eqn_026(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! fjohc : input real : f-value for central solenoid current at end-of-flattop !! rjohc : input real : allowable central solenoid current density at end of flat-top (A/m2) - !! coheof : input real : central solenoid overall current density at end of flat-top (A/m2) + !! j_cs_flat_top_end : input real : central solenoid overall current density at end of flat-top (A/m2) use constraint_variables, only: fjohc - use pfcoil_variables, only: rjohc, coheof + use pfcoil_variables, only: rjohc, j_cs_flat_top_end implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -1367,9 +1367,9 @@ subroutine constraint_eqn_026(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 - fjohc * rjohc/coheof + tmp_cc = 1.0D0 - fjohc * rjohc/j_cs_flat_top_end tmp_con = rjohc - tmp_err = rjohc - coheof / fjohc + tmp_err = rjohc - j_cs_flat_top_end / fjohc tmp_symbol = '<' tmp_units = 'A/m2' diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 3882ad8d7c..37df9a5670 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -296,7 +296,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) use numerics, only: factor, boundl, minmax, neqns, nvar, epsfcn, ixc, & epsvmc, ftol, ipnvars, ioptimz, nineqns, ipeqns, boundu, icc, ipnfoms, name_xc use pfcoil_variables, only: rhopfbus, rjconpf, zref, fcuohsu, oh_steel_frac, vf, & - coheof, sigpfcalw, alstroh, i_pf_conductor, fcupfsu, fvssu, etapsu, i_cs_stress, & + j_cs_flat_top_end, sigpfcalw, alstroh, i_pf_conductor, fcupfsu, fvssu, etapsu, i_cs_stress, & fbmaxcs, ngc, rpf2, fcohbop, f_z_cs_tf_internal, vfohc, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & n_pf_coil_groups, i_pf_superconductor, nfxfh, alfapf, routr, sigpfcf, rho_pf_coil, bmaxcs_lim, & n_pf_coils_in_group, nfixmx, cptdin, i_pf_location, i_sup_pf_shape, rref, i_pf_current, & @@ -1831,8 +1831,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('alfapf') call parse_real_variable('alfapf', alfapf, 1.0D-12, 1.0D0, & 'PF coil current smoothing parameter') - case ('coheof') - call parse_real_variable('coheof', coheof, 1.0D4, 5.0D8, & + case ('j_cs_flat_top_end') + call parse_real_variable('j_cs_flat_top_end', j_cs_flat_top_end, 1.0D4, 5.0D8, & 'Central Solenoid current density at EOF') case ('cptdin') call parse_real_array('cptdin', cptdin, isub1, ngc2, & diff --git a/source/fortran/iteration_variables.f90 b/source/fortran/iteration_variables.f90 index 5ed451636c..ba66a3af32 100755 --- a/source/fortran/iteration_variables.f90 +++ b/source/fortran/iteration_variables.f90 @@ -861,25 +861,25 @@ end subroutine set_itv_36 !--------------------------------- subroutine init_itv_37 - !!
  • (37) coheof + !!
  • (37) j_cs_flat_top_end use numerics, only: lablxc, boundl, boundu implicit none - lablxc(37) = 'coheof ' + lablxc(37) = 'j_cs_flat_top_end ' boundl(37) = 1.000D5 boundu(37) = 1.000D8 end subroutine init_itv_37 real(kind(1.d0)) function itv_37() - use pfcoil_variables, only: coheof + use pfcoil_variables, only: j_cs_flat_top_end implicit none - itv_37 = coheof + itv_37 = j_cs_flat_top_end end function itv_37 subroutine set_itv_37(ratio) - use pfcoil_variables, only: coheof + use pfcoil_variables, only: j_cs_flat_top_end implicit none real(kind(1.d0)) :: ratio - coheof = ratio + j_cs_flat_top_end = ratio end subroutine set_itv_37 !--------------------------------- diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index 6a4d593488..6ed1ba76c7 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -240,7 +240,7 @@ module numerics !!
  • (34) fdivcol (f-value for equation 22) !!
  • (35) fpeakb (f-value for equation 25) !!
  • (36) fbeta_max (f-value for equation 24) - !!
  • (37) coheof + !!
  • (37) j_cs_flat_top_end !!
  • (38) fjohc (f-value for equation 26) !!
  • (39) fjohc0 (f-value for equation 27) !!
  • (40) fgamcd (f-value for equation 37) diff --git a/source/fortran/output.f90 b/source/fortran/output.f90 index 0365da0edd..9c7d0f8926 100755 --- a/source/fortran/output.f90 +++ b/source/fortran/output.f90 @@ -381,7 +381,7 @@ subroutine ovarre(file,descr,varnam,value,output_flag) ! Remove the "(" and ")" from the varnam stripped = varnam(2:len(varnam)-1) - ! May need to strip Python module name (e.g. the pfv. from pfv.coheof) + ! May need to strip Python module name (e.g. the pfv. from pfv.j_cs_flat_top_end) ! This ensures the ITV flag is still added when required in output files dotindex = scan(stripped,".") stripped = stripped(dotindex+1:) diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index a83e85a113..372a6be4cb 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -74,7 +74,7 @@ module pfcoil_variables real(dp) :: j_cs_pulse_start !! Central solenoid overall current density at beginning of pulse (A/m2) - real(dp) :: coheof + real(dp) :: j_cs_flat_top_end !! Central solenoid overall current density at end of flat-top (A/m2) (`iteration variable 37`) (`sweep variable 62`) real(dp), dimension(ngc2,6) :: c_pf_coil_turn @@ -428,7 +428,7 @@ subroutine init_pfcoil_variables ccls_ma = (/0.0D0, 0.0D0, 0.0D0, & 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0/) j_cs_pulse_start = 0.0D0 - coheof = 1.85D7 + j_cs_flat_top_end = 1.85D7 c_pf_coil_turn = 0.0D0 cptdin = (/4.0D4, 4.0D4, 4.0D4, & 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, & diff --git a/source/fortran/scan.f90 b/source/fortran/scan.f90 index 4cbf0cd29d..532163026a 100644 --- a/source/fortran/scan.f90 +++ b/source/fortran/scan.f90 @@ -97,7 +97,7 @@ module scan_module !!
  • 59 `dr_fw_plasma_gap_outboard` : Outboard plasma-first wall gap !!
  • 60 sig_tf_wp_max: Allowable stress in TF Coil conduit (Tresca) !!
  • 61 copperaoh_m2_max : CS coil current / copper area - !!
  • 62 coheof : CS coil current density at EOF + !!
  • 62 j_cs_flat_top_end : CS coil current density at EOF !!
  • 63 dr_cs : CS thickness (m) !!
  • 64 f_z_cs_tf_internal : CS height (m) !!
  • 65 n_cycle_min : Minimum cycles for CS stress model constraint 90 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 78f8d26415..e53b14ff4e 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -777,7 +777,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.0264E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -1290,10 +1290,10 @@ bmxlim = 14.0 * Central solenoid EOF current density upper limit * *--------------------------------------------------* icc = 26 -ixc = 37 * coheof [A/m2] +ixc = 37 * j_cs_flat_top_end [A/m2] ixc = 38 * fjohc boundu(38) = 1.0 -coheof = 1.5E7 +j_cs_flat_top_end = 1.5E7 fjohc = 0.6 * Central solenoid BOP current density upper limit * diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 7b7f09dde0..9296ad449f 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -778,7 +778,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.0264E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -1291,10 +1291,10 @@ bmxlim = 14.0 * Central solenoid EOF current density upper limit * *--------------------------------------------------* icc = 26 -ixc = 37 * coheof [A/m2] +ixc = 37 * j_cs_flat_top_end [A/m2] ixc = 38 * fjohc boundu(38) = 1.0 -coheof = 1.5E7 +j_cs_flat_top_end = 1.5E7 fjohc = 0.6 * Central solenoid BOP current density upper limit * diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 3048e1d2ab..19733031aa 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -778,7 +778,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.0264E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -1291,10 +1291,10 @@ bmxlim = 14.0 * Central solenoid EOF current density upper limit * *--------------------------------------------------* icc = 26 -ixc = 37 * coheof [A/m2] +ixc = 37 * j_cs_flat_top_end [A/m2] ixc = 38 * fjohc boundu(38) = 1.0 -coheof = 1.5E7 +j_cs_flat_top_end = 1.5E7 fjohc = 0.6 * Central solenoid BOP current density upper limit * diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 5fe3d1ed80..1dd3e5a90c 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -778,7 +778,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.0264E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -1291,10 +1291,10 @@ bmxlim = 14.0 * Central solenoid EOF current density upper limit * *--------------------------------------------------* icc = 26 -ixc = 37 * coheof [A/m2] +ixc = 37 * j_cs_flat_top_end [A/m2] ixc = 38 * fjohc boundu(38) = 1.0 -coheof = 1.5E7 +j_cs_flat_top_end = 1.5E7 fjohc = 0.6 * Central solenoid BOP current density upper limit * diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 8651f4f668..598b3d4fd0 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -103,10 +103,10 @@ bmxlim = 14.0 * Central solenoid EOF current density upper limit * *--------------------------------------------------* icc = 26 -ixc = 37 * coheof [A/m2] +ixc = 37 * j_cs_flat_top_end [A/m2] ixc = 38 * fjohc boundu(38) = 1.0 -coheof = 1.5E7 +j_cs_flat_top_end = 1.5E7 fjohc = 0.6 * Central solenoid BOP current density upper limit * diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index e5b78e5af1..cce15074d9 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -781,7 +781,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6220E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0866E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6495E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.0188E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0188E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9704E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7696E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -1294,10 +1294,10 @@ bmxlim = 14.0 * Central solenoid EOF current density upper limit * *--------------------------------------------------* icc = 26 -ixc = 37 * coheof [A/m2] +ixc = 37 * j_cs_flat_top_end [A/m2] ixc = 38 * fjohc boundu(38) = 1.0 -coheof = 1.5E7 +j_cs_flat_top_end = 1.5E7 fjohc = 0.6 * Central solenoid BOP current density upper limit * diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index cc85197e96..c52a92f4a8 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -56,7 +56,7 @@ ixc = 18 * q boundl(18) = 3.0 ixc = 29 * dr_bore boundl(29) = 0.1 -ixc = 37 * coheof +ixc = 37 * j_cs_flat_top_end ixc = 41 * fcohbop ixc = 44 * fvsbrnni ixc = 56 * tdmptf @@ -279,7 +279,7 @@ epsvmc = 1e-7 * epsvmc /1;0e-6/ ; error tolerance for VMCON *-----------------Pfcoil Variables-----------------* alstroh = 7.5d8 * allowable hoop stress in Central Solenoid structural material (Pa) -coheof = 21443595.371072624 * Central solenoid overall current density at end of flat-top (A/m2) (`iteration variable 37`) (`sweep variable 62`) +j_cs_flat_top_end = 21443595.371072624 * Central solenoid overall current density at end of flat-top (A/m2) (`iteration variable 37`) (`sweep variable 62`) cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * peak current per turn input for PF coil i (A) fcohbop = 0.93491189654662 * ratio of central solenoid overall current density at beginning of pulse / end of flat-top fcuohsu = 0.70 * copper fraction of strand in central solenoid diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 88e5755b60..bf0008de39 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -47,7 +47,7 @@ boundl(18) = 3.5 ixc = 29 * dr_bore boundl(29) = 0.1 ixc = 36 * fbeta_max -ixc = 37 * coheof +ixc = 37 * j_cs_flat_top_end ixc = 38 * fjohc boundu(38) = 1.0 ixc = 39 * fjohc0 @@ -223,7 +223,7 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon *-----------------Pfcoil Variables-----------------* -coheof = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) +j_cs_flat_top_end = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; @@ -346,7 +346,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) q95 = 3.5000E+00 dr_bore = 2.3322E+00 fbeta_max = 4.8251E-01 - coheof = 2.0726E+07 + j_cs_flat_top_end = 2.0726E+07 fjohc = 5.7941E-01 fjohc0 = 5.3923E-01 fcohbop = 9.3176E-01 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 5656b8a709..fd5401a132 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -779,7 +779,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.4875E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0463E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7086E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.1229E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1229E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0486E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.5540E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -1942,7 +1942,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5259E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0578E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7235E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.1286E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1286E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0684E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.5277E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -3105,7 +3105,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5459E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0638E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7334E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.1239E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1239E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0815E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.5352E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -4268,7 +4268,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5486E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0646E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7341E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.1225E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1225E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0802E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.5349E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -5431,7 +5431,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5102E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0531E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7118E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.1309E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1309E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0685E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.5266E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -6594,7 +6594,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5201E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0560E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7309E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.1525E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1525E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0572E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4639E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -7757,7 +7757,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5281E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0584E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7359E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.1559E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1559E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0569E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4494E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -8920,7 +8920,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5337E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0601E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7320E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.1509E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1509E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0708E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4622E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -10083,7 +10083,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5380E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0614E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7257E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.1466E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1466E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0841E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4724E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -11246,7 +11246,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5386E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0616E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7254E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.1461E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1461E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0834E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4720E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -12409,7 +12409,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5351E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0605E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7316E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.1474E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1474E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0691E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4697E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -13572,7 +13572,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5531E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0659E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7526E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.1499E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1499E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0559E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4537E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -14735,7 +14735,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5550E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0665E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7533E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.1490E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1490E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0549E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4535E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -15898,7 +15898,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5498E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0649E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7403E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.1459E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1459E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0688E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4673E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -17061,7 +17061,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5491E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0647E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7308E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.1426E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1426E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0828E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4798E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -17586,10 +17586,10 @@ bmxlim = 14.0 * Central solenoid EOF current density upper limit * *--------------------------------------------------* icc = 26 -ixc = 37 * coheof [A/m2] +ixc = 37 * j_cs_flat_top_end [A/m2] ixc = 38 * fjohc boundu(38) = 1.0 -coheof = 1.5E7 +j_cs_flat_top_end = 1.5E7 fjohc = 0.6 * Central solenoid BOP current density upper limit * diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index ea2493e887..aa51a9fdcd 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -626,7 +626,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 1.2788E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV @@ -1621,7 +1621,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 1.2788E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV @@ -2616,7 +2616,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 1.2788E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV @@ -3611,7 +3611,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 1.2788E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV @@ -4606,7 +4606,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 1.2788E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV @@ -5601,7 +5601,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 1.2788E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV @@ -6596,7 +6596,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 1.2788E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV @@ -7591,7 +7591,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 1.2788E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV @@ -8586,7 +8586,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 1.2788E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV @@ -9024,7 +9024,7 @@ boundl(18) = 3.5 ixc = 29 * dr_bore boundl(29) = 0.1 ixc = 36 * fbeta_max -ixc = 37 * coheof +ixc = 37 * j_cs_flat_top_end ixc = 38 * fjohc boundu(38) = 1.0 ixc = 39 * fjohc0 @@ -9202,7 +9202,7 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon *-----------------Pfcoil Variables-----------------* -coheof = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) +j_cs_flat_top_end = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; @@ -9326,7 +9326,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) q95 = 3.5000E+00 dr_bore = 2.3322E+00 fbeta_max = 4.8251E-01 - coheof = 2.0726E+07 + j_cs_flat_top_end = 2.0726E+07 fjohc = 5.7941E-01 fjohc0 = 5.3923E-01 fcohbop = 9.3176E-01 diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 30d39270a6..bf53492210 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -47,7 +47,7 @@ boundl(18) = 3.5 ixc = 29 * dr_bore boundl(29) = 0.1 ixc = 36 * fbeta_max -ixc = 37 * coheof +ixc = 37 * j_cs_flat_top_end ixc = 38 * fjohc boundu(38) = 1.0 ixc = 39 * fjohc0 @@ -223,7 +223,7 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon *-----------------Pfcoil Variables-----------------* -coheof = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) +j_cs_flat_top_end = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; @@ -346,7 +346,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) q95 = 3.5000E+00 dr_bore = 2.3322E+00 fbeta_max = 4.8251E-01 - coheof = 2.0726E+07 + j_cs_flat_top_end = 2.0726E+07 fjohc = 5.7941E-01 fjohc0 = 5.3923E-01 fcohbop = 9.3176E-01 diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index c1e774fd4b..ff6dbb740f 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -47,7 +47,7 @@ boundl(18) = 3.5 ixc = 29 * dr_bore boundl(29) = 0.1 ixc = 36 * fbeta_max -ixc = 37 * coheof +ixc = 37 * j_cs_flat_top_end ixc = 38 * fjohc boundu(38) = 1.0 ixc = 39 * fjohc0 @@ -223,7 +223,7 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon *-----------------Pfcoil Variables-----------------* -coheof = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) +j_cs_flat_top_end = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; @@ -346,7 +346,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) q95 = 3.5000E+00 dr_bore = 2.3322E+00 fbeta_max = 4.8251E-01 - coheof = 2.0726E+07 + j_cs_flat_top_end = 2.0726E+07 fjohc = 5.7941E-01 fjohc0 = 5.3923E-01 fcohbop = 9.3176E-01 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 966b9fb16d..b318a371cc 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1468,7 +1468,7 @@ "coefuelt": 0.0, "coeoam": 0.0, "j_cs_pulse_start": 0.0, - "coheof": 18500000.0, + "j_cs_flat_top_end": 18500000.0, "coldmass": 0.0, "comp": null, "comp_eps": "EPSILON(unit)", @@ -9131,7 +9131,7 @@ "coefuelt": "'fuel' (including replaceable components) contribution to cost of electricity (m$/kW-hr)", "coeoam": "operation and maintenance contribution to cost of electricity (m$/kW-hr)", "j_cs_pulse_start": "Central solenoid overall current density at beginning of pulse (A/m2)", - "coheof": "Central solenoid overall current density at end of flat-top (A/m2) (`iteration variable 37`) (`sweep variable 62`)", + "j_cs_flat_top_end": "Central solenoid overall current density at end of flat-top (A/m2) (`iteration variable 37`) (`sweep variable 62`)", "coldmass": "total mass of components at cryogenic temperatures (kg)", "comp_eps": "", "comp_eps2": "", @@ -9956,8 +9956,8 @@ "ksic": "power fraction for outboard double-null scrape-off plasma", "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)
      \n
      \n
    • ( 1) Beta (consistency equation) (itv 5)\n
    • ( 2) Global power balance (consistency equation) (itv 10,1,2,3,4,6,11)\n
    • ( 3) Ion power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
    • ( 4) Electron power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
    • ( 5) Density upper limit (itv 9,1,2,3,4,5,6)\n
    • ( 6) (Epsilon x beta poloidal) upper limit (itv 8,1,2,3,4,6)\n
    • ( 7) Beam ion density (NBI) (consistency equation) (itv 7)\n
    • ( 8) Neutron wall load upper limit (itv 14,1,2,3,4,6)\n
    • ( 9) Fusion power upper limit (itv 26,1,2,3,4,6)\n
    • (10) Toroidal field 1/R (consistency equation) (itv 12,1,2,3,13 )\n
    • (11) Radial build (consistency equation) (itv 3,1,13,16,29,42,61)\n
    • (12) Volt second lower limit (STEADY STATE) (itv 15,1,2,3)\n
    • (13) Burn time lower limit (PULSE) (itv 21,1,16,17,29,42,44,61)\n (itv 19,1,2,3,6)\n
    • (14) Neutral beam decay lengths to plasma centre (NBI) (consistency equation)\n
    • (15) LH power threshold limit (itv 103)\n
    • (16) Net electric power lower limit (itv 25,1,2,3)\n
    • (17) Radiation fraction upper limit (itv 28)\n
    • (18) Divertor heat load upper limit (itv 27)\n
    • (19) MVA upper limit (itv 30)\n
    • (20) Neutral beam tangency radius upper limit (NBI) (itv 33,31,3,13)\n
    • (21) Plasma minor radius lower limit (itv 32)\n
    • (22) Divertor collisionality upper limit (itv 34,43)\n
    • (23) Conducting shell to plasma minor radius ratio upper limit\n (itv 104,1,74)\n
    • (24) Beta upper limit (itv 36,1,2,3,4,6,18)\n
    • (25) Peak toroidal field upper limit (itv 35,3,13,29)\n
    • (26) Central solenoid EOF current density upper limit (i_pf_conductor=0)\n (itv 38,37,41,12)\n
    • (27) Central solenoid BOP current density upper limit (i_pf_conductor=0)\n (itv 39,37,41,12)\n
    • (28) Fusion gain Q lower limit (itv 45,47,40)\n
    • (29) Inboard radial build consistency (itv 3,1,13,16,29,42,61)\n
    • (30) Injection power upper limit (itv 46,47,11)\n
    • (31) TF coil case stress upper limit (SCTF) (itv 48,56,57,58,59,60,24)\n
    • (32) TF coil conduit stress upper limit (SCTF) (itv 49,56,57,58,59,60,24)\n
    • (33) I_op / I_critical (TF coil) (SCTF) (itv 50,56,57,58,59,60,24)\n
    • (34) Dump voltage upper limit (SCTF) (itv 51,52,56,57,58,59,60,24)\n
    • (35) J_winding pack/J_protection upper limit (SCTF) (itv 53,56,57,58,59,60,24)\n
    • (36) TF coil temperature margin lower limit (SCTF) (itv 54,55,56,57,58,59,60,24)\n
    • (37) Current drive gamma upper limit (itv 40,47)\n
    • (38) First wall coolant temperature rise upper limit (itv 62)\n
    • (39) First wall peak temperature upper limit (itv 63)\n
    • (40) Start-up injection power lower limit (PULSE) (itv 64)\n
    • (41) Plasma current ramp-up time lower limit (PULSE) (itv 66,65)\n
    • (42) Cycle time lower limit (PULSE) (itv 17,67,65)\n
    • (43) Average centrepost temperature\n (TART) (consistency equation) (itv 13,20,69,70)\n
    • (44) Peak centrepost temperature upper limit (TART) (itv 68,69,70)\n
    • (45) Edge safety factor lower limit (TART) (itv 71,1,2,3)\n
    • (46) Equation for Ip/Irod upper limit (TART) (itv 72,2,60)\n
    • (47) NOT USED\n
    • (48) Poloidal beta upper limit (itv 79,2,3,18)\n
    • (49) NOT USED\n
    • (50) IFE repetition rate upper limit (IFE)\n
    • (51) Startup volt-seconds consistency (PULSE) (itv 16,29,3,1)\n
    • (52) Tritium breeding ratio lower limit (itv 89,90,91)\n
    • (53) Neutron fluence on TF coil upper limit (itv 92,93,94)\n
    • (54) Peak TF coil nuclear heating upper limit (itv 95,93,94)\n
    • (55) Vacuum vessel helium concentration upper limit i_blanket_type =2 (itv 96,93,94)\n
    • (56) Pseparatrix/Rmajor upper limit (itv 97,1,3)\n
    • (57) NOT USED\n
    • (58) NOT USED\n
    • (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 )\n
    • (60) Central solenoid temperature margin lower limit (SCTF) (itv 106)\n
    • (61) Minimum availability value (itv 107)\n
    • (62) f_alpha_energy_confinement the ratio of particle to energy confinement times (itv 110)\n
    • (63) The number of ITER-like vacuum pumps niterpump < tfno (itv 111)\n
    • (64) Zeff less than or equal to zeffmax (itv 112)\n
    • (65) Dump time set by VV loads (itv 56, 113)\n
    • (66) Limit on rate of change of energy in poloidal field\n (Use iteration variable 65(t_current_ramp_up), 115)\n
    • (67) Simple Radiation Wall load limit (itv 116, 4,6)\n
    • (68) Psep * Bt / qAR upper limit (itv 117)\n
    • (69) ensure separatrix power = the value from Kallenbach divertor (itv 118)\n
    • (70) ensure that teomp = separatrix temperature in the pedestal profile,\n (itv 119 (tesep))\n
    • (71) ensure that neomp = separatrix density (nesep) x neratio\n
    • (72) central solenoid shear stress limit (Tresca yield criterion) (itv 123 foh_stress)\n
    • (73) Psep >= Plh + Paux (itv 137 (fplhsep))\n
    • (74) TFC quench < tmax_croco (itv 141 (fcqt))\n
    • (75) TFC current/copper area < Maximum (itv 143 f_coppera_m2)\n
    • (76) Eich critical separatrix density\n
    • (77) TF coil current per turn upper limit\n
    • (78) Reinke criterion impurity fraction lower limit (itv 147 freinke)\n
    • (79) Peak CS field upper limit (itv 149 fbmaxcs)\n
    • (80) Divertor power lower limit pdivt (itv 153 fpdivlim)\n
    • (81) Ne(0) > ne(ped) constraint (itv 154 fne0)\n
    • (82) toroidalgap > tftort constraint (itv 171 ftoroidalgap)\n
    • (83) Radial build consistency for stellarators (itv 172 f_avspace)\n
    • (84) Lower limit for beta (itv 173 fbeta_min)\n
    • (85) Constraint for CP lifetime\n
    • (86) Constraint for TF coil turn dimension\n
    • (87) Constraint for cryogenic power\n
    • (88) Constraint for TF coil strain absolute value\n
    • (89) Constraint for CS coil quench protection\n
    • (90) Checking if the design point is ECRH ignitable (itv 164 fecrh_ignition)
    \n\n\n\n", "lablmm": "lablmm(ipnfoms) : labels describing figures of merit:
      \n
      \n
    • ( 1) major radius\n
    • ( 2) not used\n
    • ( 3) neutron wall load\n
    • ( 4) P_tf + P_pf\n
    • ( 5) fusion gain Q\n
    • ( 6) cost of electricity\n
    • ( 7) capital cost (direct cost if ireactor=0,\n constructed cost otherwise)\n
    • ( 8) aspect ratio\n
    • ( 9) divertor heat load\n
    • (10) toroidal field\n
    • (11) total injected power\n
    • (12) hydrogen plant capital cost OBSOLETE\n
    • (13) hydrogen production rate OBSOLETE\n
    • (14) pulse length\n
    • (15) plant availability factor (N.B. requires\n iavail=1 to be set)\n
    • (16) linear combination of major radius (minimised) and pulse length (maximised)\n note: FoM should be minimised only!\n
    • (17) net electrical output\n
    • (18) Null Figure of Merit\n
    • (19) linear combination of big Q and pulse length (maximised)\n note: FoM should be minimised only!
    \n\n\n", - "lablxc": "lablxc(ipnvars) : labels describing iteration variables
      \n
      \n
    • ( 1) aspect\n
    • ( 2) bt\n
    • ( 3) rmajor\n
    • ( 4) te\n
    • ( 5) beta\n
    • ( 6) dene\n
    • ( 7) f_nd_beam_electron\n
    • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
    • ( 9) fdene (f-value for equation 5)\n
    • (10) hfact\n
    • (11) pheat\n
    • (12) oacdcp\n
    • (13) dr_tf_inboard (NOT RECOMMENDED)\n
    • (14) fwalld (f-value for equation 8)\n
    • (15) fvs (f-value for equation 12)\n
    • (16) dr_cs\n
    • (17) tdwell\n
    • (18) q\n
    • (19) beam_energy\n
    • (20) temp_cp_average\n
    • (21) ftburn (f-value for equation 13)\n
    • (22) NOT USED\n
    • (23) fcoolcp\n
    • (24) NOT USED\n
    • (25) fpnetel (f-value for equation 16)\n
    • (26) ffuspow (f-value for equation 9)\n
    • (27) fhldiv (f-value for equation 18)\n
    • (28) fradpwr (f-value for equation 17), total radiation fraction\n
    • (29) dr_bore\n
    • (30) fmva (f-value for equation 19)\n
    • (31) gapomin\n
    • (32) frminor (f-value for equation 21)\n
    • (33) fportsz (f-value for equation 20)\n
    • (34) fdivcol (f-value for equation 22)\n
    • (35) fpeakb (f-value for equation 25)\n
    • (36) fbeta_max (f-value for equation 24)\n
    • (37) coheof\n
    • (38) fjohc (f-value for equation 26)\n
    • (39) fjohc0 (f-value for equation 27)\n
    • (40) fgamcd (f-value for equation 37)\n
    • (41) fcohbop\n
    • (42) dr_cs_tf_gap\n
    • (43) NOT USED\n
    • (44) fvsbrnni\n
    • (45) fqval (f-value for equation 28)\n
    • (46) fpinj (f-value for equation 30)\n
    • (47) feffcd\n
    • (48) fstrcase (f-value for equation 31)\n
    • (49) fstrcond (f-value for equation 32)\n
    • (50) fiooic (f-value for equation 33)\n
    • (51) fvdump (f-value for equation 34)\n
    • (52) vdalw\n
    • (53) fjprot (f-value for equation 35)\n
    • (54) ftmargtf (f-value for equation 36)\n
    • (55) NOT USED\n
    • (56) tdmptf\n
    • (57) thkcas\n
    • (58) thwcndut\n
    • (59) fcutfsu\n
    • (60) cpttf\n
    • (61) dr_shld_vv_gap_inboard\n
    • (62) fdtmp (f-value for equation 38)\n
    • (63) ftpeak (f-value for equation 39)\n
    • (64) fauxmn (f-value for equation 40)\n
    • (65) tohs\n
    • (66) ftohs (f-value for equation 41)\n
    • (67) ftcycl (f-value for equation 42)\n
    • (68) fptemp (f-value for equation 44)\n
    • (69) rcool\n
    • (70) vcool\n
    • (71) fq (f-value for equation 45)\n
    • (72) fipir (f-value for equation 46)\n
    • (73) dr_fw_plasma_gap_inboard\n
    • (74) dr_fw_plasma_gap_outboard\n
    • (75) tfootfi\n
    • (76) NOT USED\n
    • (77) NOT USED\n
    • (78) NOT USED\n
    • (79) fbeta_poloidal (f-value for equation 48)\n
    • (80) NOT USED\n
    • (81) edrive\n
    • (82) drveff\n
    • (83) tgain\n
    • (84) chrad\n
    • (85) pdrive\n
    • (86) frrmax (f-value for equation 50)\n
    • (87) NOT USED\n
    • (88) NOT USED\n
    • (89) ftbr (f-value for equation 52)\n
    • (90) blbuith\n
    • (91) blbuoth\n
    • (92) fflutf (f-value for equation 53)\n
    • (93) dr_shld_inboard\n
    • (94) dr_shld_outboard\n
    • (95) fptfnuc (f-value for equation 54)\n
    • (96) fvvhe (f-value for equation 55)\n
    • (97) fpsepr (f-value for equation 56)\n
    • (98) li6enrich\n
    • (99) NOT USED\n
    • (100) NOT USED\n
    • (101) NOT USED\n
    • (102) fimpvar\n
    • (103) fl_h_threshold (f-value for equation 15)\n
    • (104)fr_conducting_wall (f-value for equation 23)\n
    • (105) fnbshinef (f-value for equation 59)\n
    • (106) ftmargoh (f-value for equation 60)\n
    • (107) favail (f-value for equation 61)\n
    • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
    • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
    • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
    • (111) fniterpump: f-value for constraint that number\n
    • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
    • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
    • (114) len_fw_channel: Length of a single first wall channel\n
    • (115) fpoloidalpower: f-value for max rate of change of\n
    • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
    • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
    • (118) fpsep: f-value to ensure separatrix power is less than\n
    • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
    • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
    • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
    • (122) oh_steel_frac : streel fraction of Central Solenoid\n
    • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
    • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
    • (125) fimp(3) : Beryllium density fraction relative to electron density\n
    • (126) fimp(4) : Carbon density fraction relative to electron density\n
    • (127) fimp(5) : Nitrogen fraction relative to electron density\n
    • (128) fimp(6) : Oxygen density fraction relative to electron density\n
    • (129) fimp(7) : Neon density fraction relative to electron density\n
    • (130) fimp(8) : Silicon density fraction relative to electron density\n
    • (131) fimp(9) : Argon density fraction relative to electron density\n
    • (132) fimp(10) : Iron density fraction relative to electron density\n
    • (133) fimp(11) : Nickel density fraction relative to electron density\n
    • (134) fimp(12) : Krypton density fraction relative to electron density\n
    • (135) fimp(13) : Xenon density fraction relative to electron density\n
    • (136) fimp(14) : Tungsten density fraction relative to electron density\n
    • (137) fplhsep (f-value for equation 73)\n
    • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
    • (139) copper_thick : thickness of copper layer in tape (m)\n
    • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
    • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
    • (142) nesep : electron density at separatrix [m-3]\n
    • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
    • (144) fnesep : Eich critical electron density at separatrix\n
    • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
    • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
    • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
    • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
    • (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n
    • (152) fbmaxcs : Ratio of separatrix density to Greenwald density\n
    • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
    • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
    • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
    • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
    • (157) fvssu : F-value for available to required start up flux (con. 51)\n
    • (158) croco_thick : Thickness of CroCo copper tube (m)\n
    • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
    • (160) f_avspace (f-value for equation 83)\n
    • (161) fbeta_min (f-value for equation 84)\n
    • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
    • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
    • (164) f_crypmw : f-value for cryogenic plant power\n
    • (165) fstr_wp : f-value for TF coil strain absolute value\n
    • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
    • (167) fecrh_ignition: f-value for equation 90\n
    • (168) EMPTY : Description\n
    • (169) EMPTY : Description\n
    • (170) EMPTY : Description\n
    • (171) EMPTY : Description\n
    • (172) EMPTY : Description\n
    • (173) EMPTY : Description\n
    • (174) EMPTY : Description\n
    • (175) EMPTY : Description\n\n\n\n", - "lablxc": "lablxc(ipnvars) : labels describing iteration variables
        \n
        \n
      • ( 1) aspect\n
      • ( 2) bt\n
      • ( 3) rmajor\n
      • ( 4) te\n
      • ( 5) beta\n
      • ( 6) dene\n
      • ( 7) f_nd_beam_electron\n
      • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
      • ( 9) fdene (f-value for equation 5)\n
      • (10) hfact\n
      • (11) pheat\n
      • (12) oacdcp\n
      • (13) dr_tf_inboard (NOT RECOMMENDED)\n
      • (14) fwalld (f-value for equation 8)\n
      • (15) fvs (f-value for equation 12)\n
      • (16) dr_cs\n
      • (17) t_between_pulse\n
      • (18) q\n
      • (19) beam_energy\n
      • (20) temp_cp_average\n
      • (21) ft_burn (f-value for equation 13)\n
      • (22) NOT USED\n
      • (23) fcoolcp\n
      • (24) NOT USED\n
      • (25) fpnetel (f-value for equation 16)\n
      • (26) ffuspow (f-value for equation 9)\n
      • (27) fhldiv (f-value for equation 18)\n
      • (28) fradpwr (f-value for equation 17), total radiation fraction\n
      • (29) dr_bore\n
      • (30) fmva (f-value for equation 19)\n
      • (31) gapomin\n
      • (32) frminor (f-value for equation 21)\n
      • (33) fportsz (f-value for equation 20)\n
      • (34) fdivcol (f-value for equation 22)\n
      • (35) fpeakb (f-value for equation 25)\n
      • (36) fbeta_max (f-value for equation 24)\n
      • (37) coheof\n
      • (38) fjohc (f-value for equation 26)\n
      • (39) fjohc0 (f-value for equation 27)\n
      • (40) fgamcd (f-value for equation 37)\n
      • (41) fcohbop\n
      • (42) dr_cs_tf_gap\n
      • (43) NOT USED\n
      • (44) fvsbrnni\n
      • (45) fqval (f-value for equation 28)\n
      • (46) fpinj (f-value for equation 30)\n
      • (47) feffcd\n
      • (48) fstrcase (f-value for equation 31)\n
      • (49) fstrcond (f-value for equation 32)\n
      • (50) fiooic (f-value for equation 33)\n
      • (51) fvdump (f-value for equation 34)\n
      • (52) vdalw\n
      • (53) fjprot (f-value for equation 35)\n
      • (54) ftmargtf (f-value for equation 36)\n
      • (55) NOT USED\n
      • (56) tdmptf\n
      • (57) thkcas\n
      • (58) thwcndut\n
      • (59) fcutfsu\n
      • (60) cpttf\n
      • (61) dr_shld_vv_gap_inboard\n
      • (62) fdtmp (f-value for equation 38)\n
      • (63) ftpeak (f-value for equation 39)\n
      • (64) fauxmn (f-value for equation 40)\n
      • (65) t_current_ramp_up\n
      • (66) ft_current_ramp_up (f-value for equation 41)\n
      • (67) ftcycl (f-value for equation 42)\n
      • (68) fptemp (f-value for equation 44)\n
      • (69) rcool\n
      • (70) vcool\n
      • (71) fq (f-value for equation 45)\n
      • (72) fipir (f-value for equation 46)\n
      • (73) dr_fw_plasma_gap_inboard\n
      • (74) dr_fw_plasma_gap_outboard\n
      • (75) tfootfi\n
      • (76) NOT USED\n
      • (77) NOT USED\n
      • (78) NOT USED\n
      • (79) fbetap (f-value for equation 48)\n
      • (80) NOT USED\n
      • (81) edrive\n
      • (82) drveff\n
      • (83) tgain\n
      • (84) chrad\n
      • (85) pdrive\n
      • (86) frrmax (f-value for equation 50)\n
      • (87) NOT USED\n
      • (88) NOT USED\n
      • (89) ftbr (f-value for equation 52)\n
      • (90) blbuith\n
      • (91) blbuoth\n
      • (92) fflutf (f-value for equation 53)\n
      • (93) dr_shld_inboard\n
      • (94) dr_shld_outboard\n
      • (95) fptfnuc (f-value for equation 54)\n
      • (96) fvvhe (f-value for equation 55)\n
      • (97) fpsepr (f-value for equation 56)\n
      • (98) li6enrich\n
      • (99) NOT USED\n
      • (100) NOT USED\n
      • (101) NOT USED\n
      • (102) fimpvar\n
      • (103) fl_h_threshold (f-value for equation 15)\n
      • (104)fr_conducting_wall (f-value for equation 23)\n
      • (105) fnbshinef (f-value for equation 59)\n
      • (106) ftmargoh (f-value for equation 60)\n
      • (107) favail (f-value for equation 61)\n
      • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
      • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
      • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
      • (111) fniterpump: f-value for constraint that number\n
      • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
      • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
      • (114) len_fw_channel: Length of a single first wall channel\n
      • (115) fpoloidalpower: f-value for max rate of change of\n
      • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
      • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
      • (118) fpsep: f-value to ensure separatrix power is less than\n
      • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
      • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
      • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
      • (122) oh_steel_frac : streel fraction of Central Solenoid\n
      • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
      • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
      • (125) fimp(3) : Beryllium density fraction relative to electron density\n
      • (126) fimp(4) : Carbon density fraction relative to electron density\n
      • (127) fimp(5) : Nitrogen fraction relative to electron density\n
      • (128) fimp(6) : Oxygen density fraction relative to electron density\n
      • (129) fimp(7) : Neon density fraction relative to electron density\n
      • (130) fimp(8) : Silicon density fraction relative to electron density\n
      • (131) fimp(9) : Argon density fraction relative to electron density\n
      • (132) fimp(10) : Iron density fraction relative to electron density\n
      • (133) fimp(11) : Nickel density fraction relative to electron density\n
      • (134) fimp(12) : Krypton density fraction relative to electron density\n
      • (135) fimp(13) : Xenon density fraction relative to electron density\n
      • (136) fimp(14) : Tungsten density fraction relative to electron density\n
      • (137) fplhsep (f-value for equation 73)\n
      • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
      • (139) copper_thick : thickness of copper layer in tape (m)\n
      • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
      • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
      • (142) nesep : electron density at separatrix [m-3]\n
      • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
      • (144) fnesep : Eich critical electron density at separatrix\n
      • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
      • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
      • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
      • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
      • (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n
      • (152) fbmaxcs : Ratio of separatrix density to Greenwald density\n
      • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
      • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
      • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
      • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
      • (157) fvssu : F-value for available to required start up flux (con. 51)\n
      • (158) croco_thick : Thickness of CroCo copper tube (m)\n
      • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
      • (160) f_avspace (f-value for equation 83)\n
      • (161) fbeta_min (f-value for equation 84)\n
      • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
      • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
      • (164) f_crypmw : f-value for cryogenic plant power\n
      • (165) fstr_wp : f-value for TF coil strain absolute value\n
      • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
      • (167) fecrh_ignition: f-value for equation 90\n
      • (168) EMPTY : Description\n
      • (169) EMPTY : Description\n
      • (170) EMPTY : Description\n
      • (171) EMPTY : Description\n
      • (172) EMPTY : Description\n
      • (173) EMPTY : Description\n
      • (174) EMPTY : Description\n
      • (175) EMPTY : Description\n\n\n\n", + "lablxc": "lablxc(ipnvars) : labels describing iteration variables
          \n
          \n
        • ( 1) aspect\n
        • ( 2) bt\n
        • ( 3) rmajor\n
        • ( 4) te\n
        • ( 5) beta\n
        • ( 6) dene\n
        • ( 7) f_nd_beam_electron\n
        • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
        • ( 9) fdene (f-value for equation 5)\n
        • (10) hfact\n
        • (11) pheat\n
        • (12) oacdcp\n
        • (13) dr_tf_inboard (NOT RECOMMENDED)\n
        • (14) fwalld (f-value for equation 8)\n
        • (15) fvs (f-value for equation 12)\n
        • (16) dr_cs\n
        • (17) tdwell\n
        • (18) q\n
        • (19) beam_energy\n
        • (20) temp_cp_average\n
        • (21) ftburn (f-value for equation 13)\n
        • (22) NOT USED\n
        • (23) fcoolcp\n
        • (24) NOT USED\n
        • (25) fpnetel (f-value for equation 16)\n
        • (26) ffuspow (f-value for equation 9)\n
        • (27) fhldiv (f-value for equation 18)\n
        • (28) fradpwr (f-value for equation 17), total radiation fraction\n
        • (29) dr_bore\n
        • (30) fmva (f-value for equation 19)\n
        • (31) gapomin\n
        • (32) frminor (f-value for equation 21)\n
        • (33) fportsz (f-value for equation 20)\n
        • (34) fdivcol (f-value for equation 22)\n
        • (35) fpeakb (f-value for equation 25)\n
        • (36) fbeta_max (f-value for equation 24)\n
        • (37) j_cs_flat_top_end\n
        • (38) fjohc (f-value for equation 26)\n
        • (39) fjohc0 (f-value for equation 27)\n
        • (40) fgamcd (f-value for equation 37)\n
        • (41) fcohbop\n
        • (42) dr_cs_tf_gap\n
        • (43) NOT USED\n
        • (44) fvsbrnni\n
        • (45) fqval (f-value for equation 28)\n
        • (46) fpinj (f-value for equation 30)\n
        • (47) feffcd\n
        • (48) fstrcase (f-value for equation 31)\n
        • (49) fstrcond (f-value for equation 32)\n
        • (50) fiooic (f-value for equation 33)\n
        • (51) fvdump (f-value for equation 34)\n
        • (52) vdalw\n
        • (53) fjprot (f-value for equation 35)\n
        • (54) ftmargtf (f-value for equation 36)\n
        • (55) NOT USED\n
        • (56) tdmptf\n
        • (57) thkcas\n
        • (58) thwcndut\n
        • (59) fcutfsu\n
        • (60) cpttf\n
        • (61) dr_shld_vv_gap_inboard\n
        • (62) fdtmp (f-value for equation 38)\n
        • (63) ftpeak (f-value for equation 39)\n
        • (64) fauxmn (f-value for equation 40)\n
        • (65) tohs\n
        • (66) ftohs (f-value for equation 41)\n
        • (67) ftcycl (f-value for equation 42)\n
        • (68) fptemp (f-value for equation 44)\n
        • (69) rcool\n
        • (70) vcool\n
        • (71) fq (f-value for equation 45)\n
        • (72) fipir (f-value for equation 46)\n
        • (73) dr_fw_plasma_gap_inboard\n
        • (74) dr_fw_plasma_gap_outboard\n
        • (75) tfootfi\n
        • (76) NOT USED\n
        • (77) NOT USED\n
        • (78) NOT USED\n
        • (79) fbeta_poloidal (f-value for equation 48)\n
        • (80) NOT USED\n
        • (81) edrive\n
        • (82) drveff\n
        • (83) tgain\n
        • (84) chrad\n
        • (85) pdrive\n
        • (86) frrmax (f-value for equation 50)\n
        • (87) NOT USED\n
        • (88) NOT USED\n
        • (89) ftbr (f-value for equation 52)\n
        • (90) blbuith\n
        • (91) blbuoth\n
        • (92) fflutf (f-value for equation 53)\n
        • (93) dr_shld_inboard\n
        • (94) dr_shld_outboard\n
        • (95) fptfnuc (f-value for equation 54)\n
        • (96) fvvhe (f-value for equation 55)\n
        • (97) fpsepr (f-value for equation 56)\n
        • (98) li6enrich\n
        • (99) NOT USED\n
        • (100) NOT USED\n
        • (101) NOT USED\n
        • (102) fimpvar\n
        • (103) fl_h_threshold (f-value for equation 15)\n
        • (104)fr_conducting_wall (f-value for equation 23)\n
        • (105) fnbshinef (f-value for equation 59)\n
        • (106) ftmargoh (f-value for equation 60)\n
        • (107) favail (f-value for equation 61)\n
        • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
        • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
        • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
        • (111) fniterpump: f-value for constraint that number\n
        • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
        • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
        • (114) len_fw_channel: Length of a single first wall channel\n
        • (115) fpoloidalpower: f-value for max rate of change of\n
        • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
        • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
        • (118) fpsep: f-value to ensure separatrix power is less than\n
        • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
        • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
        • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
        • (122) oh_steel_frac : streel fraction of Central Solenoid\n
        • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
        • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
        • (125) fimp(3) : Beryllium density fraction relative to electron density\n
        • (126) fimp(4) : Carbon density fraction relative to electron density\n
        • (127) fimp(5) : Nitrogen fraction relative to electron density\n
        • (128) fimp(6) : Oxygen density fraction relative to electron density\n
        • (129) fimp(7) : Neon density fraction relative to electron density\n
        • (130) fimp(8) : Silicon density fraction relative to electron density\n
        • (131) fimp(9) : Argon density fraction relative to electron density\n
        • (132) fimp(10) : Iron density fraction relative to electron density\n
        • (133) fimp(11) : Nickel density fraction relative to electron density\n
        • (134) fimp(12) : Krypton density fraction relative to electron density\n
        • (135) fimp(13) : Xenon density fraction relative to electron density\n
        • (136) fimp(14) : Tungsten density fraction relative to electron density\n
        • (137) fplhsep (f-value for equation 73)\n
        • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
        • (139) copper_thick : thickness of copper layer in tape (m)\n
        • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
        • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
        • (142) nesep : electron density at separatrix [m-3]\n
        • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
        • (144) fnesep : Eich critical electron density at separatrix\n
        • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
        • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
        • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
        • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
        • (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n
        • (152) fbmaxcs : Ratio of separatrix density to Greenwald density\n
        • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
        • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
        • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
        • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
        • (157) fvssu : F-value for available to required start up flux (con. 51)\n
        • (158) croco_thick : Thickness of CroCo copper tube (m)\n
        • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
        • (160) f_avspace (f-value for equation 83)\n
        • (161) fbeta_min (f-value for equation 84)\n
        • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
        • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
        • (164) f_crypmw : f-value for cryogenic plant power\n
        • (165) fstr_wp : f-value for TF coil strain absolute value\n
        • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
        • (167) fecrh_ignition: f-value for equation 90\n
        • (168) EMPTY : Description\n
        • (169) EMPTY : Description\n
        • (170) EMPTY : Description\n
        • (171) EMPTY : Description\n
        • (172) EMPTY : Description\n
        • (173) EMPTY : Description\n
        • (174) EMPTY : Description\n
        • (175) EMPTY : Description\n\n\n\n", + "lablxc": "lablxc(ipnvars) : labels describing iteration variables
            \n
            \n
          • ( 1) aspect\n
          • ( 2) bt\n
          • ( 3) rmajor\n
          • ( 4) te\n
          • ( 5) beta\n
          • ( 6) dene\n
          • ( 7) f_nd_beam_electron\n
          • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
          • ( 9) fdene (f-value for equation 5)\n
          • (10) hfact\n
          • (11) pheat\n
          • (12) oacdcp\n
          • (13) dr_tf_inboard (NOT RECOMMENDED)\n
          • (14) fwalld (f-value for equation 8)\n
          • (15) fvs (f-value for equation 12)\n
          • (16) dr_cs\n
          • (17) t_between_pulse\n
          • (18) q\n
          • (19) beam_energy\n
          • (20) temp_cp_average\n
          • (21) ft_burn (f-value for equation 13)\n
          • (22) NOT USED\n
          • (23) fcoolcp\n
          • (24) NOT USED\n
          • (25) fpnetel (f-value for equation 16)\n
          • (26) ffuspow (f-value for equation 9)\n
          • (27) fhldiv (f-value for equation 18)\n
          • (28) fradpwr (f-value for equation 17), total radiation fraction\n
          • (29) dr_bore\n
          • (30) fmva (f-value for equation 19)\n
          • (31) gapomin\n
          • (32) frminor (f-value for equation 21)\n
          • (33) fportsz (f-value for equation 20)\n
          • (34) fdivcol (f-value for equation 22)\n
          • (35) fpeakb (f-value for equation 25)\n
          • (36) fbeta_max (f-value for equation 24)\n
          • (37) j_cs_flat_top_end\n
          • (38) fjohc (f-value for equation 26)\n
          • (39) fjohc0 (f-value for equation 27)\n
          • (40) fgamcd (f-value for equation 37)\n
          • (41) fcohbop\n
          • (42) dr_cs_tf_gap\n
          • (43) NOT USED\n
          • (44) fvsbrnni\n
          • (45) fqval (f-value for equation 28)\n
          • (46) fpinj (f-value for equation 30)\n
          • (47) feffcd\n
          • (48) fstrcase (f-value for equation 31)\n
          • (49) fstrcond (f-value for equation 32)\n
          • (50) fiooic (f-value for equation 33)\n
          • (51) fvdump (f-value for equation 34)\n
          • (52) vdalw\n
          • (53) fjprot (f-value for equation 35)\n
          • (54) ftmargtf (f-value for equation 36)\n
          • (55) NOT USED\n
          • (56) tdmptf\n
          • (57) thkcas\n
          • (58) thwcndut\n
          • (59) fcutfsu\n
          • (60) cpttf\n
          • (61) dr_shld_vv_gap_inboard\n
          • (62) fdtmp (f-value for equation 38)\n
          • (63) ftpeak (f-value for equation 39)\n
          • (64) fauxmn (f-value for equation 40)\n
          • (65) t_current_ramp_up\n
          • (66) ft_current_ramp_up (f-value for equation 41)\n
          • (67) ftcycl (f-value for equation 42)\n
          • (68) fptemp (f-value for equation 44)\n
          • (69) rcool\n
          • (70) vcool\n
          • (71) fq (f-value for equation 45)\n
          • (72) fipir (f-value for equation 46)\n
          • (73) dr_fw_plasma_gap_inboard\n
          • (74) dr_fw_plasma_gap_outboard\n
          • (75) tfootfi\n
          • (76) NOT USED\n
          • (77) NOT USED\n
          • (78) NOT USED\n
          • (79) fbetap (f-value for equation 48)\n
          • (80) NOT USED\n
          • (81) edrive\n
          • (82) drveff\n
          • (83) tgain\n
          • (84) chrad\n
          • (85) pdrive\n
          • (86) frrmax (f-value for equation 50)\n
          • (87) NOT USED\n
          • (88) NOT USED\n
          • (89) ftbr (f-value for equation 52)\n
          • (90) blbuith\n
          • (91) blbuoth\n
          • (92) fflutf (f-value for equation 53)\n
          • (93) dr_shld_inboard\n
          • (94) dr_shld_outboard\n
          • (95) fptfnuc (f-value for equation 54)\n
          • (96) fvvhe (f-value for equation 55)\n
          • (97) fpsepr (f-value for equation 56)\n
          • (98) li6enrich\n
          • (99) NOT USED\n
          • (100) NOT USED\n
          • (101) NOT USED\n
          • (102) fimpvar\n
          • (103) fl_h_threshold (f-value for equation 15)\n
          • (104)fr_conducting_wall (f-value for equation 23)\n
          • (105) fnbshinef (f-value for equation 59)\n
          • (106) ftmargoh (f-value for equation 60)\n
          • (107) favail (f-value for equation 61)\n
          • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
          • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
          • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
          • (111) fniterpump: f-value for constraint that number\n
          • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
          • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
          • (114) len_fw_channel: Length of a single first wall channel\n
          • (115) fpoloidalpower: f-value for max rate of change of\n
          • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
          • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
          • (118) fpsep: f-value to ensure separatrix power is less than\n
          • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
          • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
          • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
          • (122) oh_steel_frac : streel fraction of Central Solenoid\n
          • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
          • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
          • (125) fimp(3) : Beryllium density fraction relative to electron density\n
          • (126) fimp(4) : Carbon density fraction relative to electron density\n
          • (127) fimp(5) : Nitrogen fraction relative to electron density\n
          • (128) fimp(6) : Oxygen density fraction relative to electron density\n
          • (129) fimp(7) : Neon density fraction relative to electron density\n
          • (130) fimp(8) : Silicon density fraction relative to electron density\n
          • (131) fimp(9) : Argon density fraction relative to electron density\n
          • (132) fimp(10) : Iron density fraction relative to electron density\n
          • (133) fimp(11) : Nickel density fraction relative to electron density\n
          • (134) fimp(12) : Krypton density fraction relative to electron density\n
          • (135) fimp(13) : Xenon density fraction relative to electron density\n
          • (136) fimp(14) : Tungsten density fraction relative to electron density\n
          • (137) fplhsep (f-value for equation 73)\n
          • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
          • (139) copper_thick : thickness of copper layer in tape (m)\n
          • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
          • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
          • (142) nesep : electron density at separatrix [m-3]\n
          • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
          • (144) fnesep : Eich critical electron density at separatrix\n
          • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
          • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
          • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
          • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
          • (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n
          • (152) fbmaxcs : Ratio of separatrix density to Greenwald density\n
          • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
          • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
          • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
          • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
          • (157) fvssu : F-value for available to required start up flux (con. 51)\n
          • (158) croco_thick : Thickness of CroCo copper tube (m)\n
          • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
          • (160) f_avspace (f-value for equation 83)\n
          • (161) fbeta_min (f-value for equation 84)\n
          • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
          • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
          • (164) f_crypmw : f-value for cryogenic plant power\n
          • (165) fstr_wp : f-value for TF coil strain absolute value\n
          • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
          • (167) fecrh_ignition: f-value for equation 90\n
          • (168) EMPTY : Description\n
          • (169) EMPTY : Description\n
          • (170) EMPTY : Description\n
          • (171) EMPTY : Description\n
          • (172) EMPTY : Description\n
          • (173) EMPTY : Description\n
          • (174) EMPTY : Description\n
          • (175) EMPTY : Description\n\n\n\n", "lambda_EU": "Decay length in EUROFER [cm]", "lambda_He_VV": "Decay length [cm]", "lambda_n_BZ_IB": "Decay length in IB BZ [cm]", @@ -10192,7 +10192,7 @@ "nre": "", "nsix": "", "nsixi": "", - "nsweep": "Switch denoting quantity to scan:
              \n
            • 1 aspect\n
            • 2 hldivlim\n
            • 3 pnetelin\n
            • 4 hfact\n
            • 5 oacdcp\n
            • 6 walalw\n
            • 7 beamfus0\n
            • 8 fqval\n
            • 9 te\n
            • 10 boundu(15: fvs)\n
            • 11 beta_norm_max\n
            • 12 bootstrap_current_fraction_max (use negative values only)\n
            • 13 boundu(10: hfact)\n
            • 14 fiooic\n
            • 15 fjprot\n
            • 16 rmajor\n
            • 17 bmxlim\n
            • 18 gammax\n
            • 19 boundl(16: dr_cs)\n
            • 20 t_burn_min\n
            • 21 not used\n
            • 22 cfactr (N.B. requires iavail=0)\n
            • 23 boundu(72: fipir)\n
            • 24 powfmax\n
            • 25 kappa\n
            • 26 triang\n
            • 27 tbrmin (for blktmodel > 0 only)\n
            • 28 bt\n
            • 29 coreradius\n
            • 31 f_alpha_energy_confinement_min\n
            • 32 epsvmc\n
            • 33 ttarget\n
            • 34 qtargettotal\n
            • 35 lambda_q_omp\n
            • 36 lambda_target\n
            • 37 lcon_factor\n
            • 38 Neon upper limit\n
            • 39 Argon upper limit\n
            • 40 Xenon upper limit\n
            • 41 dr_blkt_outboard\n
            • 42 Argon fraction fimp(9)\n
            • 43 normalised minor radius at which electron cyclotron current drive is maximum\n
            • 44 Allowable maximum shear stress (Tresca) in tf coil structural material\n
            • 45 Minimum allowable temperature margin ; tf coils\n
            • 46 boundu(150) fgwsep\n
            • 47 impurity_enrichment(9) Argon impurity enrichment\n
            • 48 TF coil - n_pancake (integer turn winding pack)\n
            • 49 TF coil - n_layer (integer turn winding pack)\n
            • 50 Xenon fraction fimp(13)\n
            • 51 Power fraction to lower DN Divertor ftar\n
            • 52 SoL radiation fraction\n
            • 54 GL_nbti upper critical field at 0 Kelvin\n
            • 55 `dr_shld_inboard` : Inboard neutron shield thickness\n
            • 56 crypmw_max: Maximum cryogenic power (ixx=164, ixc=87)\n
            • 57 `bt` lower boundary\n
            • 58 `dr_fw_plasma_gap_inboard` : Inboard plasma-first wall gap\n
            • 59 `dr_fw_plasma_gap_outboard` : Outboard plasma-first wall gap\n
            • 60 sig_tf_wp_max: Allowable stress in TF Coil conduit (Tresca)\n
            • 61 copperaoh_m2_max : CS coil current / copper area\n
            • 62 coheof : CS coil current density at EOF\n
            • 63 dr_cs : CS thickness (m)\n
            • 64 f_z_cs_tf_internal : CS height (m)
            ", + "nsweep": "Switch denoting quantity to scan:
              \n
            • 1 aspect\n
            • 2 hldivlim\n
            • 3 pnetelin\n
            • 4 hfact\n
            • 5 oacdcp\n
            • 6 walalw\n
            • 7 beamfus0\n
            • 8 fqval\n
            • 9 te\n
            • 10 boundu(15: fvs)\n
            • 11 beta_norm_max\n
            • 12 bootstrap_current_fraction_max (use negative values only)\n
            • 13 boundu(10: hfact)\n
            • 14 fiooic\n
            • 15 fjprot\n
            • 16 rmajor\n
            • 17 bmxlim\n
            • 18 gammax\n
            • 19 boundl(16: dr_cs)\n
            • 20 t_burn_min\n
            • 21 not used\n
            • 22 cfactr (N.B. requires iavail=0)\n
            • 23 boundu(72: fipir)\n
            • 24 powfmax\n
            • 25 kappa\n
            • 26 triang\n
            • 27 tbrmin (for blktmodel > 0 only)\n
            • 28 bt\n
            • 29 coreradius\n
            • 31 f_alpha_energy_confinement_min\n
            • 32 epsvmc\n
            • 33 ttarget\n
            • 34 qtargettotal\n
            • 35 lambda_q_omp\n
            • 36 lambda_target\n
            • 37 lcon_factor\n
            • 38 Neon upper limit\n
            • 39 Argon upper limit\n
            • 40 Xenon upper limit\n
            • 41 dr_blkt_outboard\n
            • 42 Argon fraction fimp(9)\n
            • 43 normalised minor radius at which electron cyclotron current drive is maximum\n
            • 44 Allowable maximum shear stress (Tresca) in tf coil structural material\n
            • 45 Minimum allowable temperature margin ; tf coils\n
            • 46 boundu(150) fgwsep\n
            • 47 impurity_enrichment(9) Argon impurity enrichment\n
            • 48 TF coil - n_pancake (integer turn winding pack)\n
            • 49 TF coil - n_layer (integer turn winding pack)\n
            • 50 Xenon fraction fimp(13)\n
            • 51 Power fraction to lower DN Divertor ftar\n
            • 52 SoL radiation fraction\n
            • 54 GL_nbti upper critical field at 0 Kelvin\n
            • 55 `dr_shld_inboard` : Inboard neutron shield thickness\n
            • 56 crypmw_max: Maximum cryogenic power (ixx=164, ixc=87)\n
            • 57 `bt` lower boundary\n
            • 58 `dr_fw_plasma_gap_inboard` : Inboard plasma-first wall gap\n
            • 59 `dr_fw_plasma_gap_outboard` : Outboard plasma-first wall gap\n
            • 60 sig_tf_wp_max: Allowable stress in TF Coil conduit (Tresca)\n
            • 61 copperaoh_m2_max : CS coil current / copper area\n
            • 62 j_cs_flat_top_end : CS coil current density at EOF\n
            • 63 dr_cs : CS thickness (m)\n
            • 64 f_z_cs_tf_internal : CS height (m)
            ", "nsweep_2": "nsweep_2 /3/ : switch denoting quantity to scan for 2D scan:", "nt": "", "ntype": "switch for vacuum pump type:\n
              \n
            • =0 - for turbomolecular pump (magnetic bearing) with speed of 2.0 m3/s\n (1.95 for N2, 1.8 for He, 1.8 for DT)
              • \n
            • =1 - for compound cryopump with nominal speed of 10.0 m3/s\n (9.0 for N2, 5.0 for He and 25.0 for DT)
              • \n
            ", @@ -11917,7 +11917,7 @@ "lb": 2.0, "ub": 10.0 }, - "coheof": { + "j_cs_flat_top_end": { "lb": 10000.0, "ub": 500000000.0 }, @@ -15134,7 +15134,7 @@ "lb": 0.1, "ub": 20.0 }, - "coheof": { + "j_cs_flat_top_end": { "lb": 100000.0, "ub": 100000000.0 }, @@ -15721,7 +15721,7 @@ "breeder_f": 0.5, "bt": 5.68, "chrad": 6.5, - "coheof": 18500000.0, + "j_cs_flat_top_end": 18500000.0, "copper_thick": 0.0001, "cpttf": 70000.0, "croco_thick": 0.0025, @@ -16352,7 +16352,7 @@ }, "37": { "lb": 100000.0, - "name": "coheof", + "name": "j_cs_flat_top_end", "ub": 100000000.0 }, "38": { @@ -16751,7 +16751,7 @@ "34": "fdivcol", "35": "fpeakb", "36": "fbeta_max", - "37": "coheof", + "37": "j_cs_flat_top_end", "38": "fjohc", "39": "fjohc0", "4": "te", @@ -16822,7 +16822,7 @@ "breeder_f": "108", "bt": "2", "chrad": "84", - "coheof": "37", + "j_cs_flat_top_end": "37", "copper_thick": "139", "cpttf": "60", "croco_thick": "158", @@ -18936,7 +18936,7 @@ "ccl0_ma", "ccls_ma", "j_cs_pulse_start", - "coheof", + "j_cs_flat_top_end", "c_pf_coil_turn", "cptdin", "curpfb", @@ -19935,7 +19935,7 @@ "boundl(2=swp(iscn": "case(58)", "boundu(152=swp(iscn": "case(47)", "boundu(157=swp(iscn": "case(54)", - "coheof=swp(iscn": "case(63)", + "j_cs_flat_top_end=swp(iscn": "case(63)", "copperaoh_m2_max=swp(iscn": "case(62)", "crypmw_max=swp(iscn": "case(57)", "fimp(13=swp(iscn": "case(51)", @@ -20085,7 +20085,7 @@ "dz_tf_cryostat": "real_variable", "clh2": "real_variable", "f_z_cryostat": "real_variable", - "coheof": "real_variable", + "j_cs_flat_top_end": "real_variable", "conf_mag": "real_variable", "control_buildings_h": "real_variable", "control_buildings_l": "real_variable", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 8d375b6676..65201d91e9 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -100,7 +100,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "waves", np.full([22, 6], 0.0)) monkeypatch.setattr(pfv, "sxlg", np.full([22, 22], 0.0)) monkeypatch.setattr(pfv, "sigpfcalw", 5.0e2) - monkeypatch.setattr(pfv, "coheof", 1.6932e7) + monkeypatch.setattr(pfv, "j_cs_flat_top_end", 1.6932e7) monkeypatch.setattr(pfv, "z_pf_coil_upper", np.full(22, 0.0)) monkeypatch.setattr(pfv, "fcohbof", 2.654e-1) monkeypatch.setattr(pfv, "r_pf_coil_inner", np.full(22, 0.0)) @@ -194,7 +194,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "n_cs_pf_coils", 5) monkeypatch.setattr(pfv, "bmaxoh", 1.4e1) monkeypatch.setattr(pfv, "i_cs_stress", 0) - monkeypatch.setattr(pfv, "coheof", 1.693e7) + monkeypatch.setattr(pfv, "j_cs_flat_top_end", 1.693e7) monkeypatch.setattr(pfv, "r_cs_middle", 3.0) monkeypatch.setattr(pfv, "vfohc", 3.0e-1) monkeypatch.setattr(pfv, "jcableoh_bop", 1.069e8) @@ -2364,7 +2364,7 @@ def test_peakb(monkeypatch: pytest.MonkeyPatch, pfcoil: PFCoil): order="F", ), ) - monkeypatch.setattr(pfv, "coheof", 20726000) + monkeypatch.setattr(pfv, "j_cs_flat_top_end", 20726000) monkeypatch.setattr(pfv, "n_pf_coil_groups", 4) monkeypatch.setattr(pfv, "bpf", np.zeros(22, dtype=int)) # maybe monkeypatch.setattr( diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 451ed4bbf3..150171d807 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -103,10 +103,10 @@ bmxlim = 14.0 * Central solenoid EOF current density upper limit * *--------------------------------------------------* icc = 26 -ixc = 37 * coheof [A/m2] +ixc = 37 * j_cs_flat_top_end [A/m2] ixc = 38 * fjohc boundu(38) = 1.0 -coheof = 1.5E7 +j_cs_flat_top_end = 1.5E7 fjohc = 0.6 * Central solenoid BOP current density upper limit * diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 069d75af55..50a4ee30da 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -76,8 +76,8 @@ bmxlim = 14.0 * Central solenoid EOF current density upper limit * *--------------------------------------------------* icc = 26 -ixc = 37 * coheof [A/m2] -coheof = 1.5E7 +ixc = 37 * j_cs_flat_top_end [A/m2] +j_cs_flat_top_end = 1.5E7 fjohc = 1.0 * Central solenoid BOP current density upper limit * diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index 9acf7b144e..5fdeb5b6c3 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -56,7 +56,7 @@ ixc = 18 * q boundl(18) = 3.0 ixc = 29 * dr_bore boundl(29) = 0.1 -ixc = 37 * coheof +ixc = 37 * j_cs_flat_top_end ixc = 41 * fcohbop ixc = 44 * fvsbrnni ixc = 56 * tdmptf @@ -279,7 +279,7 @@ epsvmc = 1e-7 * epsvmc /1;0e-6/ ; error tolerance for VMCON *-----------------Pfcoil Variables-----------------* alstroh = 7.5d8 * allowable hoop stress in Central Solenoid structural material (Pa) -coheof = 21443595.371072624 * Central solenoid overall current density at end of flat-top (A/m2) (`iteration variable 37`) (`sweep variable 62`) +j_cs_flat_top_end = 21443595.371072624 * Central solenoid overall current density at end of flat-top (A/m2) (`iteration variable 37`) (`sweep variable 62`) cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * peak current per turn input for PF coil i (A) fcohbop = 0.93491189654662 * ratio of central solenoid overall current density at beginning of pulse / end of flat-top fcuohsu = 0.70 * copper fraction of strand in central solenoid diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 5cbd5fe2ca..6b3ed008b9 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1751,10 +1751,10 @@ i_pf_conductor = 0 *icc = 26 * DESCRIPTION: Constraint equation for CS current density upper limit at EOF * JUSTIFICATION: Turned off, dont care about CS current density limit -* VARIABLES: coheof calculated in-situ +* VARIABLES: j_cs_flat_top_end calculated in-situ *ixc = 37 -*coheof = +*j_cs_flat_top_end = *boundl(37) = *boundu(37) = * DESCRIPTION: Central solenoid overall current density at end of flat-top (A/m2) (icc = 26) diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index bedd9c3b9f..49f49ff7bb 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -103,10 +103,10 @@ bmxlim = 14.0 * Central solenoid EOF current density upper limit * *--------------------------------------------------* icc = 26 -ixc = 37 * coheof [A/m2] +ixc = 37 * j_cs_flat_top_end [A/m2] ixc = 38 * fjohc boundu(38) = 1.0 -coheof = 1.5E7 +j_cs_flat_top_end = 1.5E7 fjohc = 0.6 * Central solenoid BOP current density upper limit * diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 6cea827924..fbd8c6dbaf 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -781,7 +781,7 @@ Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6220E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0866E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6495E+07 OP - Actual_overall_current_density_at_EOF_(A/m2)____________________________ (coheof)______________________ 2.0188E+07 ITV + Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0188E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9704E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7696E-01 ITV Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 @@ -1294,10 +1294,10 @@ bmxlim = 14.0 * Central solenoid EOF current density upper limit * *--------------------------------------------------* icc = 26 -ixc = 37 * coheof [A/m2] +ixc = 37 * j_cs_flat_top_end [A/m2] ixc = 38 * fjohc boundu(38) = 1.0 -coheof = 1.5E7 +j_cs_flat_top_end = 1.5E7 fjohc = 0.6 * Central solenoid BOP current density upper limit * diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 88ca6f9747..a5208aec46 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -3577,7 +3577,7 @@ class StressclParam(NamedTuple): f_z_cs_tf_internal: Any = None - coheof: Any = None + j_cs_flat_top_end: Any = None j_cs_pulse_start: Any = None @@ -3700,7 +3700,7 @@ class StressclParam(NamedTuple): i_pf_conductor=0, oh_steel_frac=0.57874999999999999, f_z_cs_tf_internal=0.90000000000000002, - coheof=20726000, + j_cs_flat_top_end=20726000, j_cs_pulse_start=0, n_pf_coils_in_group=np.array( np.array((1, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0), order="F"), order="F" @@ -3823,7 +3823,7 @@ class StressclParam(NamedTuple): i_pf_conductor=0, oh_steel_frac=0.57874999999999999, f_z_cs_tf_internal=0.90000000000000002, - coheof=20726000, + j_cs_flat_top_end=20726000, j_cs_pulse_start=19311657.760000002, n_pf_coils_in_group=np.array( np.array((1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0), order="F"), order="F" @@ -3947,7 +3947,7 @@ def test_stresscl(stressclparam, monkeypatch, sctfcoil): stressclparam.dr_tf_inboard, stressclparam.dr_cs_tf_gap, stressclparam.i_pf_conductor, - stressclparam.coheof, + stressclparam.j_cs_flat_top_end, stressclparam.j_cs_pulse_start, stressclparam.cptdin, stressclparam.n_pf_coils_in_group, From 1f8c6e6bd7c912cbe765c2b510601078414075e3 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 15:37:42 +0000 Subject: [PATCH 30/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'sxlg'=20to=20'in?= =?UTF-8?q?d=5Fpf=5Fcs=5Fplasma=5Fmutual'=20across=20multiple=20files=20fo?= =?UTF-8?q?r=20consistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 81 +++++++++++++++------------- process/power.py | 8 +-- process/pulse.py | 4 +- source/fortran/pfcoil_variables.f90 | 4 +- tests/integration/ref_dicts.json | 6 +-- tests/integration/test_pfcoil_int.py | 8 +-- tests/unit/test_pfcoil.py | 2 +- tests/unit/test_power.py | 10 ++-- tests/unit/test_pulse.py | 10 ++-- 9 files changed, 73 insertions(+), 60 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index baa052eeec..92d7d695be 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -438,10 +438,10 @@ def pfcoil(self): # Flux swing from vertical field # If this is the first visit to the routine the inductance matrix - # sxlg and the turns array have not yet been calculated, so we set + # ind_pf_cs_plasma_mutual and the turns array have not yet been calculated, so we set # them to (very) approximate values to avoid strange behaviour... if pf.first_call: - pfv.sxlg[:, :] = 1.0e0 + pfv.ind_pf_cs_plasma_mutual[:, :] = 1.0e0 pfv.n_pf_coil_turns[:] = 100.0e0 pf.first_call = False @@ -451,7 +451,9 @@ def pfcoil(self): for _i in range(pfv.n_pf_coils_in_group[ccount]): pfflux = pfflux + ( pf.ccls[ccount] - * pfv.sxlg[nocoil, pfv.n_pf_cs_plasma_circuits - 1] + * pfv.ind_pf_cs_plasma_mutual[ + nocoil, pfv.n_pf_cs_plasma_circuits - 1 + ] / pfv.n_pf_coil_turns[nocoil] ) nocoil = nocoil + 1 @@ -463,8 +465,8 @@ def pfcoil(self): # Required current change in CS coil # Proposed new calculation... - # dics = csflux / sxlg(n_cs_pf_coils,n_pf_cs_plasma_circuits) - # BUT... sxlg(n_cs_pf_coils,n_pf_cs_plasma_circuits) is around 2000 times ddics below... + # dics = csflux / ind_pf_cs_plasma_mutual(n_cs_pf_coils,n_pf_cs_plasma_circuits) + # BUT... ind_pf_cs_plasma_mutual(n_cs_pf_coils,n_pf_cs_plasma_circuits) is around 2000 times ddics below... ddics = ( 4.0e-7 @@ -1502,23 +1504,25 @@ def vsec(self): for i in range(pf.nef): pf.vsdum[i, 0] = ( - pfv.sxlg[pfv.n_pf_cs_plasma_circuits - 1, i] * pfv.c_pf_coil_turn[i, 1] + pfv.ind_pf_cs_plasma_mutual[pfv.n_pf_cs_plasma_circuits - 1, i] + * pfv.c_pf_coil_turn[i, 1] ) pf.vsdum[i, 1] = ( - pfv.sxlg[pfv.n_pf_cs_plasma_circuits - 1, i] * pfv.c_pf_coil_turn[i, 2] + pfv.ind_pf_cs_plasma_mutual[pfv.n_pf_cs_plasma_circuits - 1, i] + * pfv.c_pf_coil_turn[i, 2] ) pfv.vsefsu = pfv.vsefsu + (pf.vsdum[i, 1] - pf.vsdum[i, 0]) # Central Solenoid startup volt-seconds if bv.iohcl != 0: pf.vsdum[pfv.n_cs_pf_coils - 1, 0] = ( - pfv.sxlg[ + pfv.ind_pf_cs_plasma_mutual[ pfv.n_pf_cs_plasma_circuits - 1, pfv.n_pf_cs_plasma_circuits - 2 ] * pfv.c_pf_coil_turn[pfv.n_pf_cs_plasma_circuits - 2, 1] ) pf.vsdum[pfv.n_cs_pf_coils - 1, 1] = ( - pfv.sxlg[ + pfv.ind_pf_cs_plasma_mutual[ pfv.n_pf_cs_plasma_circuits - 1, pfv.n_pf_cs_plasma_circuits - 2 ] * pfv.c_pf_coil_turn[pfv.n_pf_cs_plasma_circuits - 2, 2] @@ -1533,7 +1537,7 @@ def vsec(self): # Burn volt-seconds if bv.iohcl != 0: pf.vsdum[pfv.n_cs_pf_coils - 1, 2] = ( - pfv.sxlg[ + pfv.ind_pf_cs_plasma_mutual[ pfv.n_pf_cs_plasma_circuits - 1, pfv.n_pf_cs_plasma_circuits - 2 ] * pfv.c_pf_coil_turn[pfv.n_pf_cs_plasma_circuits - 2, 4] @@ -1546,7 +1550,8 @@ def vsec(self): pfv.vsefbn = 0.0e0 for i in range(pf.nef): pf.vsdum[i, 2] = ( - pfv.sxlg[pfv.n_pf_cs_plasma_circuits - 1, i] * pfv.c_pf_coil_turn[i, 4] + pfv.ind_pf_cs_plasma_mutual[pfv.n_pf_cs_plasma_circuits - 1, i] + * pfv.c_pf_coil_turn[i, 4] ) pfv.vsefbn = pfv.vsefbn + (pf.vsdum[i, 2] - pf.vsdum[i, 1]) @@ -1706,7 +1711,7 @@ def induct(self, output): rplasma = np.zeros(nplas) zplasma = np.zeros(nplas) - pfv.sxlg[:, :] = 0.0 + pfv.ind_pf_cs_plasma_mutual[:, :] = 0.0 # Break Central Solenoid into noh segments # @@ -1794,17 +1799,19 @@ def induct(self, output): xc[ii] = 0.5e0 * (xcin[ii] + xcout[ii]) xohpl = xohpl + xc[ii] - pfv.sxlg[pfv.n_pf_cs_plasma_circuits - 1, pfv.n_cs_pf_coils - 1] = ( - xohpl / (nplas * noh) * pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1] - ) - pfv.sxlg[pfv.n_cs_pf_coils - 1, pfv.n_pf_cs_plasma_circuits - 1] = pfv.sxlg[ + pfv.ind_pf_cs_plasma_mutual[ + pfv.n_pf_cs_plasma_circuits - 1, pfv.n_cs_pf_coils - 1 + ] = xohpl / (nplas * noh) * pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1] + pfv.ind_pf_cs_plasma_mutual[ + pfv.n_cs_pf_coils - 1, pfv.n_pf_cs_plasma_circuits - 1 + ] = pfv.ind_pf_cs_plasma_mutual[ pfv.n_pf_cs_plasma_circuits - 1, pfv.n_cs_pf_coils - 1 ] # Plasma self inductance - pfv.sxlg[pfv.n_pf_cs_plasma_circuits - 1, pfv.n_pf_cs_plasma_circuits - 1] = ( - pv.ind_plasma - ) + pfv.ind_pf_cs_plasma_mutual[ + pfv.n_pf_cs_plasma_circuits - 1, pfv.n_pf_cs_plasma_circuits - 1 + ] = pv.ind_plasma # PF coil / plasma mutual inductances ncoils = 0 @@ -1820,10 +1827,12 @@ def induct(self, output): for j in range(pfv.n_pf_coils_in_group[i]): ncoilj = ncoils + 1 - (j + 1) - pfv.sxlg[ncoilj - 1, pfv.n_pf_cs_plasma_circuits - 1] = ( - xpfpl / nplas * pfv.n_pf_coil_turns[ncoilj - 1] - ) - pfv.sxlg[pfv.n_pf_cs_plasma_circuits - 1, ncoilj - 1] = pfv.sxlg[ + pfv.ind_pf_cs_plasma_mutual[ + ncoilj - 1, pfv.n_pf_cs_plasma_circuits - 1 + ] = xpfpl / nplas * pfv.n_pf_coil_turns[ncoilj - 1] + pfv.ind_pf_cs_plasma_mutual[ + pfv.n_pf_cs_plasma_circuits - 1, ncoilj - 1 + ] = pfv.ind_pf_cs_plasma_mutual[ ncoilj - 1, pfv.n_pf_cs_plasma_circuits - 1 ] @@ -1835,9 +1844,9 @@ def induct(self, output): pfv.r_pf_coil_outer[pfv.n_cs_pf_coils - 1] - pfv.r_pf_coil_inner[pfv.n_cs_pf_coils - 1] ) # radial winding thickness - pfv.sxlg[pfv.n_cs_pf_coils - 1, pfv.n_cs_pf_coils - 1] = ( - self.selfinductance(a, b, c, pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1]) - ) + pfv.ind_pf_cs_plasma_mutual[ + pfv.n_cs_pf_coils - 1, pfv.n_cs_pf_coils - 1 + ] = self.selfinductance(a, b, c, pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1]) # Central Solenoid / PF coil mutual inductances for i in range(noh): @@ -1856,15 +1865,15 @@ def induct(self, output): for j in range(pfv.n_pf_coils_in_group[i]): ncoilj = ncoils + 1 - (j + 1) - pfv.sxlg[ncoilj - 1, pfv.n_cs_pf_coils - 1] = ( + pfv.ind_pf_cs_plasma_mutual[ncoilj - 1, pfv.n_cs_pf_coils - 1] = ( xohpf * pfv.n_pf_coil_turns[ncoilj - 1] * pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1] / noh ) - pfv.sxlg[pfv.n_cs_pf_coils - 1, ncoilj - 1] = pfv.sxlg[ - ncoilj - 1, pfv.n_cs_pf_coils - 1 - ] + pfv.ind_pf_cs_plasma_mutual[pfv.n_cs_pf_coils - 1, ncoilj - 1] = ( + pfv.ind_pf_cs_plasma_mutual[ncoilj - 1, pfv.n_cs_pf_coils - 1] + ) # PF coil - PF coil inductances if bv.iohcl == 0: @@ -1884,21 +1893,21 @@ def induct(self, output): xc, br, bz, psi = bfield(rc, zc, cc, rp, zp) for k in range(pf.nef): if k < i: - pfv.sxlg[i, k] = ( + pfv.ind_pf_cs_plasma_mutual[i, k] = ( xc[k] * pfv.n_pf_coil_turns[k] * pfv.n_pf_coil_turns[i] ) elif k == i: rl = abs( pfv.z_pf_coil_upper[k] - pfv.z_pf_coil_lower[k] ) / math.sqrt(constants.pi) - pfv.sxlg[k, k] = ( + pfv.ind_pf_cs_plasma_mutual[k, k] = ( constants.rmu0 * pfv.n_pf_coil_turns[k] ** 2 * pfv.r_pf_coil_middle[k] * (math.log(8.0e0 * pfv.r_pf_coil_middle[k] / rl) - 1.75e0) ) else: - pfv.sxlg[i, k] = ( + pfv.ind_pf_cs_plasma_mutual[i, k] = ( xc[k - 1] * pfv.n_pf_coil_turns[k] * pfv.n_pf_coil_turns[i] ) @@ -1914,18 +1923,18 @@ def induct(self, output): for ig in range(pf.nef): op.write( self.outfile, - f"{ig}\t{pfv.sxlg[: pfv.n_pf_cs_plasma_circuits, ig]}", + f"{ig}\t{pfv.ind_pf_cs_plasma_mutual[: pfv.n_pf_cs_plasma_circuits, ig]}", ) if bv.iohcl != 0: op.write( self.outfile, - f"CS\t\t\t{pfv.sxlg[: pfv.n_pf_cs_plasma_circuits, pfv.n_pf_cs_plasma_circuits - 2]}", + f"CS\t\t\t{pfv.ind_pf_cs_plasma_mutual[: pfv.n_pf_cs_plasma_circuits, pfv.n_pf_cs_plasma_circuits - 2]}", ) op.write( self.outfile, - f"Plasma\t{pfv.sxlg[: pfv.n_pf_cs_plasma_circuits, pfv.n_pf_cs_plasma_circuits - 1]}", + f"Plasma\t{pfv.ind_pf_cs_plasma_mutual[: pfv.n_pf_cs_plasma_circuits, pfv.n_pf_cs_plasma_circuits - 1]}", ) def outpf(self): diff --git a/process/power.py b/process/power.py index 5cad6f8419..d4b1288cd4 100644 --- a/process/power.py +++ b/process/power.py @@ -155,7 +155,7 @@ def pfpwr(self, output: bool): # pfcoil_variables.n_pf_cs_plasma_circuits : total number of PF coils (including Central Solenoid and plasma) # plasma is #n_pf_cs_plasma_circuits, and Central Solenoid is #(pfcoil_variables.n_pf_cs_plasma_circuits-1) - # pfcoil_variables.sxlg(i,j) : mutual inductance between coil i and j + # pfcoil_variables.ind_pf_cs_plasma_mutual(i,j) : mutual inductance between coil i and j for i in range(pfcoil_variables.n_pf_cs_plasma_circuits): powpfii[i] = 0.0e0 vpfi[i] = 0.0e0 @@ -171,7 +171,7 @@ def pfpwr(self, output: bool): for ipf in range(pfcoil_variables.n_pf_cs_plasma_circuits): # Voltage in circuit jpf due to change in current from circuit ipf vpfij = ( - pfcoil_variables.sxlg[jpf, ipf] + pfcoil_variables.ind_pf_cs_plasma_mutual[jpf, ipf] * ( pfcoil_variables.c_pf_coil_turn[ipf, 2] - pfcoil_variables.c_pf_coil_turn[ipf, 1] @@ -192,11 +192,11 @@ def pfpwr(self, output: bool): for time in range(6): inductxcurrent[time] = ( inductxcurrent[time] - + pfcoil_variables.sxlg[jpf, ipf] + + pfcoil_variables.ind_pf_cs_plasma_mutual[jpf, ipf] * pfcoil_variables.c_pf_coil_turn[ipf, time] ) - # engx = engx + pfcoil_variables.sxlg(jpf,ipf)*pfcoil_variables.c_pf_coil_turn(ipf,5) + # engx = engx + pfcoil_variables.ind_pf_cs_plasma_mutual(jpf,ipf)*pfcoil_variables.c_pf_coil_turn(ipf,5) # Stored magnetic energy of the poloidal field at each time # 'time' is the time INDEX. 'tim' is the time. diff --git a/process/pulse.py b/process/pulse.py index 8c50267f38..ad33c5ad93 100644 --- a/process/pulse.py +++ b/process/pulse.py @@ -86,14 +86,14 @@ def tohswg(self, output: bool) -> None: # Mutual inductance between Central Solenoid and plasma (H) - m = pfcoil_variables.sxlg[ + m = pfcoil_variables.ind_pf_cs_plasma_mutual[ pfcoil_variables.n_cs_pf_coils - 1, pfcoil_variables.n_pf_cs_plasma_circuits - 1, ] # Self inductance of Central Solenoid (H) - loh = pfcoil_variables.sxlg[ + loh = pfcoil_variables.ind_pf_cs_plasma_mutual[ pfcoil_variables.n_cs_pf_coils - 1, pfcoil_variables.n_cs_pf_coils - 1 ] diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 372a6be4cb..26644c7077 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -308,7 +308,7 @@ module pfcoil_variables real(dp) :: sigpfcf !! fraction of JxB hoop force supported by steel case for superconducting PF coils (`i_pf_conductor=0`) - real(dp), dimension(ngc2,ngc2) :: sxlg + real(dp), dimension(ngc2,ngc2) :: ind_pf_cs_plasma_mutual !! mutual inductance matrix (H) real(dp) :: temp_cs_margin @@ -492,7 +492,7 @@ subroutine init_pfcoil_variables s_tresca_oh = 0.0D0 sigpfcalw = 500.0D0 sigpfcf = 1.0D0 - sxlg = 0.0D0 + ind_pf_cs_plasma_mutual = 0.0D0 temp_cs_margin = 0.0D0 n_pf_coil_turns = 0.0D0 vf = 0.3D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index b318a371cc..08ebbb5070 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7372,7 +7372,7 @@ 0.0, 0.0 ], - "sxlg": 0.0, + "ind_pf_cs_plasma_mutual": 0.0, "t_BM_IB": 17.0, "t_BM_OB": 27.0, "t_BP_IB": 30.0, @@ -10676,7 +10676,7 @@ "summ": "", "sweep": "sweep(ipnscns) /../: actual values to use in scan", "sweep_2": "sweep_2(ipnscns) /../: actual values to use in 2D scan", - "sxlg": "mutual inductance matrix (H)", + "ind_pf_cs_plasma_mutual": "mutual inductance matrix (H)", "t_BM_IB": "BM thickness [cm]", "t_BM_OB": "BM thickness [cm]", "t_BP_IB": "BP thickness [cm]", @@ -18989,7 +18989,7 @@ "s_tresca_oh", "sigpfcalw", "sigpfcf", - "sxlg", + "ind_pf_cs_plasma_mutual", "temp_cs_margin", "turns", "vf", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 65201d91e9..098e21a307 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -98,7 +98,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "rho_pf_coil", 2.5e-8) monkeypatch.setattr(pfv, "c_pf_coil_turn", np.full([22, 6], 0.0)) monkeypatch.setattr(pfv, "waves", np.full([22, 6], 0.0)) - monkeypatch.setattr(pfv, "sxlg", np.full([22, 22], 0.0)) + monkeypatch.setattr(pfv, "ind_pf_cs_plasma_mutual", np.full([22, 22], 0.0)) monkeypatch.setattr(pfv, "sigpfcalw", 5.0e2) monkeypatch.setattr(pfv, "j_cs_flat_top_end", 1.6932e7) monkeypatch.setattr(pfv, "z_pf_coil_upper", np.full(22, 0.0)) @@ -2867,7 +2867,7 @@ def test_induct(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): 0, ]), ) - monkeypatch.setattr(pfv, "sxlg", np.ones((22, 22), dtype=int)) + monkeypatch.setattr(pfv, "ind_pf_cs_plasma_mutual", np.ones((22, 22), dtype=int)) monkeypatch.setattr(pfv, "r_cs_middle", 2.6084100000000001) monkeypatch.setattr(pfv, "n_pf_coil_groups", 4) monkeypatch.setattr( @@ -2989,7 +2989,7 @@ def test_induct(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): monkeypatch.setattr(pv, "rmajor", 8.8901000000000003) monkeypatch.setattr(pv, "ind_plasma", 1.6039223939491056e-05) - sxlg_exp = np.array([ + ind_pf_cs_plasma_mutual_exp = np.array([ [ 2.49332453e00, 4.46286166e-02, @@ -3520,4 +3520,4 @@ def test_induct(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): ], ]) pfcoil.induct(False) - assert_array_almost_equal(pfv.sxlg, sxlg_exp) + assert_array_almost_equal(pfv.ind_pf_cs_plasma_mutual, ind_pf_cs_plasma_mutual_exp) diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index 3b14e96dc5..65d03312f8 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1419,7 +1419,7 @@ def test_vsec(pfcoil, monkeypatch): monkeypatch.setattr(pfv, "n_pf_cs_plasma_circuits", 8) monkeypatch.setattr( pfv, - "sxlg", + "ind_pf_cs_plasma_mutual", np.array( [ [ diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 9541b5f29b..d08bfb0da6 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -211,7 +211,7 @@ class PfpwrParam(NamedTuple): curpfs: Any = None - sxlg: Any = None + ind_pf_cs_plasma_mutual: Any = None n_pf_coil_turns: Any = None @@ -527,7 +527,7 @@ class PfpwrParam(NamedTuple): ), order="F", ).transpose(), - sxlg=np.array( + ind_pf_cs_plasma_mutual=np.array( ( ( 2.4933245328128875, @@ -1270,7 +1270,7 @@ class PfpwrParam(NamedTuple): ), order="F", ).transpose(), - sxlg=np.array( + ind_pf_cs_plasma_mutual=np.array( ( ( 3.7834082671748859, @@ -1822,7 +1822,9 @@ def test_pfpwr(pfpwrparam, monkeypatch, power): monkeypatch.setattr(pfcoil_variables, "curpfs", pfpwrparam.curpfs) - monkeypatch.setattr(pfcoil_variables, "sxlg", pfpwrparam.sxlg) + monkeypatch.setattr( + pfcoil_variables, "ind_pf_cs_plasma_mutual", pfpwrparam.ind_pf_cs_plasma_mutual + ) monkeypatch.setattr(pfcoil_variables, "n_pf_coil_turns", pfpwrparam.n_pf_coil_turns) diff --git a/tests/unit/test_pulse.py b/tests/unit/test_pulse.py index 4fabee682c..d8e000c15e 100644 --- a/tests/unit/test_pulse.py +++ b/tests/unit/test_pulse.py @@ -38,7 +38,7 @@ class TohswgParam(NamedTuple): powohres: Any = None - sxlg: Any = None + ind_pf_cs_plasma_mutual: Any = None c_pf_coil_turn: Any = None @@ -103,7 +103,7 @@ class BurnParam(NamedTuple): i_pf_conductor=0, n_cs_pf_coils=7, powohres=0, - sxlg=np.array( + ind_pf_cs_plasma_mutual=np.array( ( ( 2.4933245328128733, @@ -661,7 +661,7 @@ class BurnParam(NamedTuple): i_pf_conductor=0, n_cs_pf_coils=7, powohres=0, - sxlg=np.array( + ind_pf_cs_plasma_mutual=np.array( ( ( 3.7857701742128254, @@ -1243,7 +1243,9 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): monkeypatch.setattr(pfcoil_variables, "powohres", tohswgparam.powohres) - monkeypatch.setattr(pfcoil_variables, "sxlg", tohswgparam.sxlg) + monkeypatch.setattr( + pfcoil_variables, "ind_pf_cs_plasma_mutual", tohswgparam.ind_pf_cs_plasma_mutual + ) monkeypatch.setattr(pfcoil_variables, "c_pf_coil_turn", tohswgparam.c_pf_coil_turn) From 90dd23e762d747e2b343b0a8179a6d60588f9625 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 15:39:35 +0000 Subject: [PATCH 31/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'bmaxcs=5Flim'=20?= =?UTF-8?q?to=20'b=5Fcs=5Flimit=5Fmax'=20across=20multiple=20files=20for?= =?UTF-8?q?=20consistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/fortran/constraint_equations.f90 | 10 +++++----- source/fortran/input.f90 | 6 +++--- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 10 +++++----- tests/regression/input_files/st_regression.IN.DAT | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index bf0bc91390..0072719418 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2987,15 +2987,15 @@ subroutine constraint_eqn_079(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! args : output structure : residual error; constraint value; residual error in physical units; output string; units string !! Equation for maximum CS field !! #=# pfcoil - !! #=#=# fbmaxcs, bmaxoh, bmaxoh0, bmaxcs_lim + !! #=#=# fbmaxcs, bmaxoh, bmaxoh0, b_cs_limit_max !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! fbmaxcs : input : F-value for CS mmax field (cons. 79, itvar 149) - !! bmaxcs_lim : input : Central solenoid max field limit [T] + !! b_cs_limit_max : input : Central solenoid max field limit [T] !! bmaxoh0 : input : maximum field in central solenoid at beginning of pulse (T) !! bmaxoh : input real : maximum field in central solenoid at end of flat-top (EoF) (T) !! (Note: original code has "bmaxoh/bmaxoh0 | peak CS field [T]".) - use pfcoil_variables, only: fbmaxcs, bmaxcs_lim, bmaxoh0, bmaxoh + use pfcoil_variables, only: fbmaxcs, b_cs_limit_max, bmaxoh0, bmaxoh implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -3003,8 +3003,8 @@ subroutine constraint_eqn_079(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 - fbmaxcs * bmaxcs_lim/max(bmaxoh, bmaxoh0) - tmp_con = bmaxcs_lim + tmp_cc = 1.0D0 - fbmaxcs * b_cs_limit_max/max(bmaxoh, bmaxoh0) + tmp_con = b_cs_limit_max tmp_err = max(bmaxoh, bmaxoh0) * tmp_cc tmp_symbol = '<' tmp_units = 'A/turn' diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 37df9a5670..85b1c4f2d2 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -298,7 +298,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) use pfcoil_variables, only: rhopfbus, rjconpf, zref, fcuohsu, oh_steel_frac, vf, & j_cs_flat_top_end, sigpfcalw, alstroh, i_pf_conductor, fcupfsu, fvssu, etapsu, i_cs_stress, & fbmaxcs, ngc, rpf2, fcohbop, f_z_cs_tf_internal, vfohc, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & - n_pf_coil_groups, i_pf_superconductor, nfxfh, alfapf, routr, sigpfcf, rho_pf_coil, bmaxcs_lim, & + n_pf_coil_groups, i_pf_superconductor, nfxfh, alfapf, routr, sigpfcf, rho_pf_coil, b_cs_limit_max, & n_pf_coils_in_group, nfixmx, cptdin, i_pf_location, i_sup_pf_shape, rref, i_pf_current, & ccl0_ma, ccls_ma, ld_ratio_cst use physics_variables, only: ipedestal, taumax, i_single_null, fvsbrnni, & @@ -1816,8 +1816,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('rhopfbus') call parse_real_variable('rhopfbus', rhopfbus, 0.0D0, 1.0D-5, & 'CS and PF coil bus (feeders) resistivity (ohm-m)') - case ('bmaxcs_lim') - call parse_real_variable('bmaxcs_lim', bmaxcs_lim, 0.01D0, 100.0D0, & + case ('b_cs_limit_max') + call parse_real_variable('b_cs_limit_max', b_cs_limit_max, 0.01D0, 100.0D0, & 'Maximum allowed peak field on central solenoid') case ('fbmaxcs') call parse_real_variable('fbmaxcs', fbmaxcs, 0.01D0, 1.0D0, & diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 26644c7077..0fb448443e 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -387,7 +387,7 @@ module pfcoil_variables !! - for groups j with i_pf_location(j) = 4; zref(j) = ratio of !! height of coil group j to plasma minor radius
          - real(dp) :: bmaxcs_lim + real(dp) :: b_cs_limit_max !! Central solenoid max field limit [T] real(dp) :: fbmaxcs @@ -516,7 +516,7 @@ subroutine init_pfcoil_variables z_pf_coil_middle = 0.0D0 zref = (/3.6D0, 1.2D0, 2.5D0, & 1.0D0, 1.0D0, 1.0D0, 1.0D0, 1.0D0, 1.0D0, 1.0D0/) - bmaxcs_lim = 13.0 + b_cs_limit_max = 13.0 fbmaxcs = 1.0 ld_ratio_cst = 70/22 l_cond_cst = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 08ebbb5070..5f9600269b 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -407,7 +407,7 @@ ], "blwidti": 0.0, "blwidto": 0.0, - "bmaxcs_lim": 13.0, + "b_cs_limit_max": 13.0, "bmaxoh": 0.0, "bmaxoh0": 0.0, "bmaxtf": 0.0, @@ -8921,7 +8921,7 @@ "blvol": "IFE blanket volume (m3)", "blwidti": "Inboard/outboard blanket mid-plan toroidal circumference for segment (m)", "blwidto": "Inboard/outboard blanket mid-plan toroidal circumference for segment (m)", - "bmaxcs_lim": "Central solenoid max field limit [T]", + "b_cs_limit_max": "Central solenoid max field limit [T]", "bmaxoh": "maximum field in central solenoid at end of flat-top (EoF) (T)", "bmaxoh0": "maximum field in central solenoid at beginning of pulse (T)", "bmaxtf": "mean peak field at TF coil (T)", @@ -11761,7 +11761,7 @@ "lb": 100000.0, "ub": 100000000.0 }, - "bmaxcs_lim": { + "b_cs_limit_max": { "lb": 0.01, "ub": 100.0 }, @@ -19012,7 +19012,7 @@ "z_pf_coil_lower", "z_pf_coil_middle", "zref", - "bmaxcs_lim", + "b_cs_limit_max", "fbmaxcs" ], "physics_functions_module": [ @@ -20040,7 +20040,7 @@ "dr_blkt_inboard": "real_variable", "dr_blkt_outboard": "real_variable", "blpressure": "real_variable", - "bmaxcs_lim": "real_variable", + "b_cs_limit_max": "real_variable", "bmn": "real_variable", "bmxlim": "real_variable", "dr_bore": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 6b3ed008b9..e8fc11cdb3 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1733,9 +1733,9 @@ i_pf_conductor = 0 *icc = 79 * DESCRIPTION: Constraint equation for maximum CS field * JUSTIFICATION: Turned off, dont care about maximum CS field -* VARIABLES: bmaxcs_lim (Central solenoid max field limit [T]). bmaxoh0,bmaxoh calculated in-situ +* VARIABLES: b_cs_limit_max (Central solenoid max field limit [T]). bmaxoh0,bmaxoh calculated in-situ -*bmaxcs_lim = +*b_cs_limit_max = * DESCRIPTION: Maximum allowed peak field on central solenoid (icc = 79) * JUSTIFICATION: Not using icc=79 From ef0f86d8b6dff800d1825f83fe41e6c6d64fc958 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 15:43:11 +0000 Subject: [PATCH 32/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'rjpfalw'=20to=20?= =?UTF-8?q?'j=5Fpf=5Fwp=5Fcritical'=20across=20multiple=20files=20for=20co?= =?UTF-8?q?nsistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 12 +++++++----- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/integration/test_pfcoil_int.py | 4 ++-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index 92d7d695be..a8bf1b9fc1 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -632,7 +632,7 @@ def pfcoil(self): if pfv.i_pf_conductor == 0: bmax = max(abs(pfv.bpf[i]), abs(pf.bpf2[i])) - pfv.rjpfalw[i], jstrand, jsc, tmarg = self.superconpf( + pfv.j_pf_wp_critical[i], jstrand, jsc, tmarg = self.superconpf( bmax, pfv.vf[i], pfv.fcupfsu, @@ -1272,8 +1272,10 @@ def ohcalc(self): tfv.tcritsc, ) - pfv.rjpfalw[pfv.n_cs_pf_coils - 1] = jcritwp * pfv.awpoh / pfv.a_cs_poloidal - pfv.rjohc0 = pfv.rjpfalw[pfv.n_cs_pf_coils - 1] + pfv.j_pf_wp_critical[pfv.n_cs_pf_coils - 1] = ( + jcritwp * pfv.awpoh / pfv.a_cs_poloidal + ) + pfv.rjohc0 = pfv.j_pf_wp_critical[pfv.n_cs_pf_coils - 1] pfv.temp_cs_margin = min(tmarg1, tmarg2) @@ -2562,7 +2564,7 @@ def outpf(self): if pfv.i_pf_conductor == 0: op.write( self.outfile, - f"PF {k}\t{pfv.ric[k]:.2e}\t{pfv.rjpfalw[k]:.2e}\t{pfv.rjconpf[k]:.2e}\t{pfv.rjconpf[k] / pfv.rjpfalw[k]:.2e}\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.m_pf_coil_structure[k]:.2e}\t{pfv.bpf[k]:.2e}", + f"PF {k}\t{pfv.ric[k]:.2e}\t{pfv.j_pf_wp_critical[k]:.2e}\t{pfv.rjconpf[k]:.2e}\t{pfv.rjconpf[k] / pfv.j_pf_wp_critical[k]:.2e}\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.m_pf_coil_structure[k]:.2e}\t{pfv.bpf[k]:.2e}", ) else: op.write( @@ -2576,7 +2578,7 @@ def outpf(self): # Issue #328 op.write( self.outfile, - f"CS\t\t{pfv.ric[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.rjpfalw[pfv.n_cs_pf_coils - 1]:.2e}\t{max(abs(pfv.j_cs_pulse_start), abs(pfv.j_cs_flat_top_end)):.2e}\t{max(abs(pfv.j_cs_pulse_start), abs(pfv.j_cs_flat_top_end)) / pfv.rjpfalw[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.bpf[pfv.n_cs_pf_coils - 1]:.2e}", + f"CS\t\t{pfv.ric[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.j_pf_wp_critical[pfv.n_cs_pf_coils - 1]:.2e}\t{max(abs(pfv.j_cs_pulse_start), abs(pfv.j_cs_flat_top_end)):.2e}\t{max(abs(pfv.j_cs_pulse_start), abs(pfv.j_cs_flat_top_end)) / pfv.j_pf_wp_critical[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.bpf[pfv.n_cs_pf_coils - 1]:.2e}", ) else: op.write( diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 0fb448443e..31b058b455 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -268,7 +268,7 @@ module pfcoil_variables real(dp) :: rjohc0 !! allowable central solenoid current density at beginning of pulse (A/m2) - real(dp), dimension(ngc2) :: rjpfalw + real(dp), dimension(ngc2) :: j_pf_wp_critical !! allowable winding pack current density of PF coil i (A/m2) real(dp) :: r_cs_middle @@ -481,7 +481,7 @@ subroutine init_pfcoil_variables 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7/) rjohc = 0.0D0 rjohc0 = 0.0D0 - rjpfalw = 0.0D0 + j_pf_wp_critical = 0.0D0 r_cs_middle = 0.0D0 routr = 1.5D0 r_pf_coil_middle = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 5f9600269b..e7c5948b8e 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -4229,7 +4229,7 @@ "rjconpf": 30000000.0, "rjohc": 0.0, "rjohc0": 0.0, - "rjpfalw": 0.0, + "j_pf_wp_critical": 0.0, "rkind": "double", "rlclolcn": 0.0, "rlenmax": 0.5, @@ -10536,7 +10536,7 @@ "rjconpf": "average winding pack current density of PF coil i (A/m2) at time of peak\n current in that coil (calculated for `i_pf_location=1` coils)", "rjohc": "allowable central solenoid current density at end of flat-top (A/m2)", "rjohc0": "allowable central solenoid current density at beginning of pulse (A/m2)", - "rjpfalw": "allowable winding pack current density of PF coil i (A/m2)", + "j_pf_wp_critical": "allowable winding pack current density of PF coil i (A/m2)", "rkind": "", "rlclolcn": "ratio of collision length / connection length", "rlenmax": "maximum value for length ratio (rlclolcn) (`constraintg eqn 22`)", @@ -18979,7 +18979,7 @@ "rjconpf", "rjohc", "rjohc0", - "rjpfalw", + "j_pf_wp_critical", "r_cs_middle", "routr", "r_pf_coil_middle", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 098e21a307..82a8ca1e49 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -110,7 +110,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "m_pf_coil_conductor_total", 0.0) monkeypatch.setattr(pfv, "fcupfsu", 6.900e-1) monkeypatch.setattr(pfv, "j_cs_pulse_start", 1.693e7) - monkeypatch.setattr(pfv, "rjpfalw", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "j_pf_wp_critical", np.full(22, 0.0)) monkeypatch.setattr(pfv, "i_sup_pf_shape", 0) monkeypatch.setattr(pfv, "rref", np.full(10, 7.0)) monkeypatch.setattr(pfv, "i_pf_current", 1) @@ -213,7 +213,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "rjohc", 4.070e7) monkeypatch.setattr(pfv, "temp_cs_margin", 1.5) monkeypatch.setattr(pfv, "i_pf_conductor", 0) - monkeypatch.setattr(pfv, "rjpfalw", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "j_pf_wp_critical", np.full(22, 0.0)) monkeypatch.setattr(pfv, "rho_pf_coil", 2.8e-8) monkeypatch.setattr(pfv, "vf", np.full(22, 0.3)) monkeypatch.setattr(pfv, "ric", np.full(22, 0.0)) From f96313c9950c168bc670cdcf7e40acabe12ab948 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 16:02:42 +0000 Subject: [PATCH 33/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'ric'=20to=20'c?= =?UTF-8?q?=5Fpf=5Fcs=5Fcoils=5Fpeak=5Fma'=20across=20multiple=20files=20f?= =?UTF-8?q?or=20consistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/costs.py | 12 +++- process/io/plot_proc.py | 2 +- process/pfcoil.py | 92 ++++++++++++++++------------ process/power.py | 6 +- process/pulse.py | 7 ++- source/fortran/pfcoil_variables.f90 | 4 +- tests/integration/ref_dicts.json | 6 +- tests/integration/test_pfcoil_int.py | 8 +-- tests/unit/test_costs_1990.py | 12 ++-- tests/unit/test_pfcoil.py | 6 +- tests/unit/test_power.py | 10 +-- tests/unit/test_pulse.py | 10 +-- 12 files changed, 104 insertions(+), 71 deletions(-) diff --git a/process/costs.py b/process/costs.py index dffa711f15..c9f93aabe9 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1589,7 +1589,7 @@ def acc2222(self): * (1.0e0 - pfcoil_variables.fcupfsu) * (1.0e0 - pfcoil_variables.vf[i]) * abs( - pfcoil_variables.ric[i] + pfcoil_variables.c_pf_cs_coils_peak_ma[i] / pfcoil_variables.n_pf_coil_turns[i] ) * 1.0e6 @@ -1620,7 +1620,10 @@ def acc2222(self): cost_variables.uccu * pfcoil_variables.fcupfsu * (1.0e0 - pfcoil_variables.vf[i]) - * abs(pfcoil_variables.ric[i] / pfcoil_variables.n_pf_coil_turns[i]) + * abs( + pfcoil_variables.c_pf_cs_coils_peak_ma[i] + / pfcoil_variables.n_pf_coil_turns[i] + ) * 1.0e6 / pfcoil_variables.rjconpf[i] * constants.dcopper @@ -1629,7 +1632,10 @@ def acc2222(self): costpfcu = ( cost_variables.uccu * (1.0e0 - pfcoil_variables.vf[i]) - * abs(pfcoil_variables.ric[i] / pfcoil_variables.n_pf_coil_turns[i]) + * abs( + pfcoil_variables.c_pf_cs_coils_peak_ma[i] + / pfcoil_variables.n_pf_coil_turns[i] + ) * 1.0e6 / pfcoil_variables.rjconpf[i] * constants.dcopper diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index df1015fbc7..45878bf424 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2588,7 +2588,7 @@ def plot_magnetics_info(axis, mfile_data, scan): pf_info = [ ( - mfile_data.data[f"ric[{i:01}]"].get_scan(scan), + mfile_data.data[f"c_pf_cs_coils_peak_ma[{i:01}]"].get_scan(scan), f"PF {i}", ) for i in range(1, number_of_coils) diff --git a/process/pfcoil.py b/process/pfcoil.py index a8bf1b9fc1..8e2f2f4b38 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -532,7 +532,7 @@ def pfcoil(self): # Set up coil current waveforms, normalised to the peak current in # each coil - self.waveform() # sets ric(), waves() + self.waveform() # sets c_pf_cs_coils_peak_ma(), waves() # Calculate PF coil geometry, current and number of turns # Dimensions are those of the winding pack, and exclude @@ -556,11 +556,13 @@ def pfcoil(self): # Number of turns # CPTDIN[i] is the current per turn (input) - pfv.n_pf_coil_turns[i] = abs((pfv.ric[i] * 1.0e6) / pfv.cptdin[i]) + pfv.n_pf_coil_turns[i] = abs( + (pfv.c_pf_cs_coils_peak_ma[i] * 1.0e6) / pfv.cptdin[i] + ) aturn[i] = area / pfv.n_pf_coil_turns[i] # Actual winding pack current density - pfv.rjconpf[i] = 1.0e6 * abs(pfv.ric[i]) / area + pfv.rjconpf[i] = 1.0e6 * abs(pfv.c_pf_cs_coils_peak_ma[i]) / area # Location of edges of each coil: # r_pf_coil_inner = inner radius, r_pf_coil_outer = outer radius @@ -582,11 +584,13 @@ def pfcoil(self): # Other coils. N.B. Current density RJCONPF[i] is defined in # routine INITIAL for these coils. area = ( - abs(pfv.ric[i] * 1.0e6 / pfv.rjconpf[i]) + abs(pfv.c_pf_cs_coils_peak_ma[i] * 1.0e6 / pfv.rjconpf[i]) * pfv.pf_current_safety_factor ) - pfv.n_pf_coil_turns[i] = abs((pfv.ric[i] * 1.0e6) / pfv.cptdin[i]) + pfv.n_pf_coil_turns[i] = abs( + (pfv.c_pf_cs_coils_peak_ma[i] * 1.0e6) / pfv.cptdin[i] + ) aturn[i] = area / pfv.n_pf_coil_turns[i] dx = 0.5e0 * math.sqrt(area) # square cross-section @@ -697,7 +701,7 @@ def pfcoil(self): forcepf = ( 0.5e6 * (pfv.bpf[i] + pf.bpf2[i]) - * abs(pfv.ric[i]) + * abs(pfv.c_pf_cs_coils_peak_ma[i]) * pfv.r_pf_coil_middle[i] ) @@ -783,7 +787,7 @@ def pfcoil(self): pfv.m_pf_coil_structure_total = ( pfv.m_pf_coil_structure_total + pfv.m_pf_coil_structure[i] ) - pf.ricpf = pf.ricpf + abs(pfv.ric[i]) + pf.ricpf = pf.ricpf + abs(pfv.c_pf_cs_coils_peak_ma[i]) # Plasma size and shape pfv.z_pf_coil_upper[pfv.n_cs_pf_coils] = pv.rminor * pv.kappa @@ -797,7 +801,7 @@ def pfcoil(self): for k in range(6): # time points for i in range(pfv.n_pf_cs_plasma_circuits - 1): pfv.c_pf_coil_turn[i, k] = pfv.waves[i, k] * math.copysign( - pfv.cptdin[i], pfv.ric[i] + pfv.cptdin[i], pfv.c_pf_cs_coils_peak_ma[i] ) # Plasma wave form @@ -1054,19 +1058,19 @@ def ohcalc(self): # Maximum current (MA-turns) in central Solenoid, at either BOP or EOF if pfv.j_cs_pulse_start > pfv.j_cs_flat_top_end: sgn = 1.0e0 - pfv.ric[pfv.n_cs_pf_coils - 1] = ( + pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1] = ( sgn * 1.0e-6 * pfv.j_cs_pulse_start * pfv.a_cs_poloidal ) else: sgn = -1.0e0 - pfv.ric[pfv.n_cs_pf_coils - 1] = ( + pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1] = ( sgn * 1.0e-6 * pfv.j_cs_flat_top_end * pfv.a_cs_poloidal ) # Number of turns pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1] = ( 1.0e6 - * abs(pfv.ric[pfv.n_cs_pf_coils - 1]) + * abs(pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1]) / pfv.cptdin[pfv.n_cs_pf_coils - 1] ) @@ -1240,7 +1244,8 @@ def ohcalc(self): pfv.bmaxoh, pfv.vfohc, pfv.fcuohsu, - (abs(pfv.ric[pfv.n_cs_pf_coils - 1]) / pfv.awpoh) * 1.0e6, + (abs(pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1]) / pfv.awpoh) + * 1.0e6, pfv.i_cs_superconductor, tfv.fhts, tfv.str_cs_con_res, @@ -1263,7 +1268,8 @@ def ohcalc(self): pfv.bmaxoh0, pfv.vfohc, pfv.fcuohsu, - (abs(pfv.ric[pfv.n_cs_pf_coils - 1]) / pfv.awpoh) * 1.0e6, + (abs(pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1]) / pfv.awpoh) + * 1.0e6, pfv.i_cs_superconductor, tfv.fhts, tfv.str_cs_con_res, @@ -1288,7 +1294,7 @@ def ohcalc(self): * pfv.r_cs_middle * pfv.rho_pf_coil / (pfv.a_cs_poloidal * (1.0e0 - pfv.vfohc)) - * (1.0e6 * pfv.ric[pfv.n_cs_pf_coils - 1]) ** 2 + * (1.0e6 * pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1]) ** 2 ) pfv.powpfres = pfv.powpfres + pfv.powohres @@ -1315,11 +1321,11 @@ def peakb(self, i, ii, it): kk = 0 else: # Check different times for maximum current - if abs(pfv.curpfb[i - 1] - pfv.ric[i - 1]) < 1.0e-12: + if abs(pfv.curpfb[i - 1] - pfv.c_pf_cs_coils_peak_ma[i - 1]) < 1.0e-12: it = 2 - elif abs(pfv.curpff[i - 1] - pfv.ric[i - 1]) < 1.0e-12: + elif abs(pfv.curpff[i - 1] - pfv.c_pf_cs_coils_peak_ma[i - 1]) < 1.0e-12: it = 4 - elif abs(pfv.curpfs[i - 1] - pfv.ric[i - 1]) < 1.0e-12: + elif abs(pfv.curpfs[i - 1] - pfv.c_pf_cs_coils_peak_ma[i - 1]) < 1.0e-12: it = 5 else: eh.idiags[0] = it @@ -1360,25 +1366,33 @@ def peakb(self, i, ii, it): pf.rfxf[kk - 1] = pfv.r_pf_coil_middle[jj - 1] pf.zfxf[kk - 1] = pfv.z_pf_coil_middle[jj - 1] + dzpf * 0.125e0 pf.cfxf[kk - 1] = ( - pfv.ric[jj - 1] * pfv.waves[jj - 1, it - 1] * 0.25e6 + pfv.c_pf_cs_coils_peak_ma[jj - 1] + * pfv.waves[jj - 1, it - 1] + * 0.25e6 ) kk = kk + 1 pf.rfxf[kk - 1] = pfv.r_pf_coil_middle[jj - 1] pf.zfxf[kk - 1] = pfv.z_pf_coil_middle[jj - 1] + dzpf * 0.375e0 pf.cfxf[kk - 1] = ( - pfv.ric[jj - 1] * pfv.waves[jj - 1, it - 1] * 0.25e6 + pfv.c_pf_cs_coils_peak_ma[jj - 1] + * pfv.waves[jj - 1, it - 1] + * 0.25e6 ) kk = kk + 1 pf.rfxf[kk - 1] = pfv.r_pf_coil_middle[jj - 1] pf.zfxf[kk - 1] = pfv.z_pf_coil_middle[jj - 1] - dzpf * 0.125e0 pf.cfxf[kk - 1] = ( - pfv.ric[jj - 1] * pfv.waves[jj - 1, it - 1] * 0.25e6 + pfv.c_pf_cs_coils_peak_ma[jj - 1] + * pfv.waves[jj - 1, it - 1] + * 0.25e6 ) kk = kk + 1 pf.rfxf[kk - 1] = pfv.r_pf_coil_middle[jj - 1] pf.zfxf[kk - 1] = pfv.z_pf_coil_middle[jj - 1] - dzpf * 0.375e0 pf.cfxf[kk - 1] = ( - pfv.ric[jj - 1] * pfv.waves[jj - 1, it - 1] * 0.25e6 + pfv.c_pf_cs_coils_peak_ma[jj - 1] + * pfv.waves[jj - 1, it - 1] + * 0.25e6 ) else: @@ -1387,7 +1401,9 @@ def peakb(self, i, ii, it): pf.rfxf[kk - 1] = pfv.r_pf_coil_middle[jj - 1] pf.zfxf[kk - 1] = pfv.z_pf_coil_middle[jj - 1] pf.cfxf[kk - 1] = ( - pfv.ric[jj - 1] * pfv.waves[jj - 1, it - 1] * 1.0e6 + pfv.c_pf_cs_coils_peak_ma[jj - 1] + * pfv.waves[jj - 1, it - 1] + * 1.0e6 ) # Plasma contribution @@ -1647,7 +1663,7 @@ def axial_stress(self): hl = pfv.z_pf_coil_upper[pfv.n_cs_pf_coils - 1] # Central Solenoid current [A] - ni = pfv.ric[pfv.n_cs_pf_coils - 1] * 1.0e6 + ni = pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1] * 1.0e6 # kb term for elliptical integrals # kb2 = SQRT((4.0e0*b**2)/(4.0e0*b**2 + hl**2)) @@ -2474,8 +2490,8 @@ def outpf(self): op.ovarre( self.mfile, f"PF coil {k} current (MA)", - f"(ric[{k}])", - pfv.ric[k], + f"(c_pf_cs_coils_peak_ma[{k}])", + pfv.c_pf_cs_coils_peak_ma[k], ) op.ovarre( self.mfile, @@ -2530,8 +2546,8 @@ def outpf(self): op.ovarre( self.mfile, "Central solenoid current (MA)", - "(ric[n_cs_pf_coils-1])", - pfv.ric[pfv.n_cs_pf_coils - 1], + "(c_pf_cs_coils_peak_ma[n_cs_pf_coils-1])", + pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1], ) op.ovarre( self.mfile, @@ -2564,12 +2580,12 @@ def outpf(self): if pfv.i_pf_conductor == 0: op.write( self.outfile, - f"PF {k}\t{pfv.ric[k]:.2e}\t{pfv.j_pf_wp_critical[k]:.2e}\t{pfv.rjconpf[k]:.2e}\t{pfv.rjconpf[k] / pfv.j_pf_wp_critical[k]:.2e}\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.m_pf_coil_structure[k]:.2e}\t{pfv.bpf[k]:.2e}", + f"PF {k}\t{pfv.c_pf_cs_coils_peak_ma[k]:.2e}\t{pfv.j_pf_wp_critical[k]:.2e}\t{pfv.rjconpf[k]:.2e}\t{pfv.rjconpf[k] / pfv.j_pf_wp_critical[k]:.2e}\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.m_pf_coil_structure[k]:.2e}\t{pfv.bpf[k]:.2e}", ) else: op.write( self.outfile, - f"PF {k}\t{pfv.ric[k]:.2e}\t-1.0e0\t{pfv.rjconpf[k]:.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.m_pf_coil_structure[k]:.2e}\t{pfv.bpf[k]:.2e}\t", + f"PF {k}\t{pfv.c_pf_cs_coils_peak_ma[k]:.2e}\t-1.0e0\t{pfv.rjconpf[k]:.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.m_pf_coil_structure[k]:.2e}\t{pfv.bpf[k]:.2e}\t", ) # Central Solenoid, if present @@ -2578,12 +2594,12 @@ def outpf(self): # Issue #328 op.write( self.outfile, - f"CS\t\t{pfv.ric[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.j_pf_wp_critical[pfv.n_cs_pf_coils - 1]:.2e}\t{max(abs(pfv.j_cs_pulse_start), abs(pfv.j_cs_flat_top_end)):.2e}\t{max(abs(pfv.j_cs_pulse_start), abs(pfv.j_cs_flat_top_end)) / pfv.j_pf_wp_critical[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.bpf[pfv.n_cs_pf_coils - 1]:.2e}", + f"CS\t\t{pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.j_pf_wp_critical[pfv.n_cs_pf_coils - 1]:.2e}\t{max(abs(pfv.j_cs_pulse_start), abs(pfv.j_cs_flat_top_end)):.2e}\t{max(abs(pfv.j_cs_pulse_start), abs(pfv.j_cs_flat_top_end)) / pfv.j_pf_wp_critical[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.bpf[pfv.n_cs_pf_coils - 1]:.2e}", ) else: op.write( self.outfile, - f"CS\t\t{pfv.ric[pfv.n_cs_pf_coils - 1]:.2e}\t-1.0e0\t{max(abs(pfv.j_cs_pulse_start)):.2e}\t{abs(pfv.j_cs_flat_top_end):.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.bpf[pfv.n_cs_pf_coils - 1]:.2e}", + f"CS\t\t{pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1]:.2e}\t-1.0e0\t{max(abs(pfv.j_cs_pulse_start)):.2e}\t{abs(pfv.j_cs_flat_top_end):.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.bpf[pfv.n_cs_pf_coils - 1]:.2e}", ) # Miscellaneous totals @@ -2802,26 +2818,26 @@ def waveform(self): if (abs(pfv.curpfb[ic]) >= abs(pfv.curpfs[ic])) and ( abs(pfv.curpfb[ic]) >= abs(pfv.curpff[ic]) ): - pfv.ric[ic] = pfv.curpfb[ic] + pfv.c_pf_cs_coils_peak_ma[ic] = pfv.curpfb[ic] # Beginning of flat-top, t = t_precharge + t_current_ramp_up if (abs(pfv.curpff[ic]) >= abs(pfv.curpfb[ic])) and ( abs(pfv.curpff[ic]) >= abs(pfv.curpfs[ic]) ): - pfv.ric[ic] = pfv.curpff[ic] + pfv.c_pf_cs_coils_peak_ma[ic] = pfv.curpff[ic] # End of flat-top, t = t_precharge + t_current_ramp_up + t_fusion_ramp + t_burn if (abs(pfv.curpfs[ic]) >= abs(pfv.curpfs[ic])) and ( abs(pfv.curpfs[ic]) >= abs(pfv.curpff[ic]) ): - pfv.ric[ic] = pfv.curpfs[ic] + pfv.c_pf_cs_coils_peak_ma[ic] = pfv.curpfs[ic] # Set normalized current waveforms pfv.waves[ic, 0] = 0.0e0 - pfv.waves[ic, 1] = pfv.curpfb[ic] / pfv.ric[ic] - pfv.waves[ic, 2] = pfv.curpff[ic] / pfv.ric[ic] - pfv.waves[ic, 3] = pfv.curpff[ic] / pfv.ric[ic] - pfv.waves[ic, 4] = pfv.curpfs[ic] / pfv.ric[ic] + pfv.waves[ic, 1] = pfv.curpfb[ic] / pfv.c_pf_cs_coils_peak_ma[ic] + pfv.waves[ic, 2] = pfv.curpff[ic] / pfv.c_pf_cs_coils_peak_ma[ic] + pfv.waves[ic, 3] = pfv.curpff[ic] / pfv.c_pf_cs_coils_peak_ma[ic] + pfv.waves[ic, 4] = pfv.curpfs[ic] / pfv.c_pf_cs_coils_peak_ma[ic] pfv.waves[ic, 5] = 0.0e0 def superconpf( diff --git a/process/power.py b/process/power.py index d4b1288cd4..2a88242fcc 100644 --- a/process/power.py +++ b/process/power.py @@ -113,7 +113,7 @@ def pfpwr(self, output: bool): pfbusr[ig] = pfcoil_variables.rhopfbus * pfbusl / (albusa[ig] / 10000) # Total PF coil resistance (during burn) - # pfcoil_variables.ric : maximum current in coil (A) + # pfcoil_variables.c_pf_cs_coils_peak_ma : maximum current in coil (A) pfcr[ig] = ( pfcoil_variables.rho_pf_coil * 2.0e0 @@ -124,7 +124,7 @@ def pfpwr(self, output: bool): / ( (1.0e0 - pfcoil_variables.vf[ic]) * 1.0e6 - * pfcoil_variables.ric[ic] + * pfcoil_variables.c_pf_cs_coils_peak_ma[ic] ) ) * pfcoil_variables.n_pf_coil_turns[ic] ** 2 @@ -135,7 +135,7 @@ def pfpwr(self, output: bool): cptburn = ( pfcoil_variables.cptdin[ic] * pfcoil_variables.curpfs[ic] - / pfcoil_variables.ric[ic] + / pfcoil_variables.c_pf_cs_coils_peak_ma[ic] ) rcktvm[ig] = abs(cptburn) * cktr[ig] # peak resistive voltage (V) rcktpm[ig] = 1.0e-6 * rcktvm[ig] * abs(cptburn) # peak resistive power (MW) diff --git a/process/pulse.py b/process/pulse.py index ad33c5ad93..e4e0fca7a7 100644 --- a/process/pulse.py +++ b/process/pulse.py @@ -64,7 +64,12 @@ def tohswg(self, output: bool) -> None: else: r = ( pfcoil_variables.powohres - / (1.0e6 * pfcoil_variables.ric[pfcoil_variables.n_cs_pf_coils - 1]) + / ( + 1.0e6 + * pfcoil_variables.c_pf_cs_coils_peak_ma[ + pfcoil_variables.n_cs_pf_coils - 1 + ] + ) ** 2 ) diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 31b058b455..c43ca2cd32 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -255,7 +255,7 @@ module pfcoil_variables real(dp), dimension(ngc2) :: r_pf_coil_outer !! outer radius of coil i (m) - real(dp), dimension(ngc2) :: ric + real(dp), dimension(ngc2) :: c_pf_cs_coils_peak_ma !! peak current in coil i (MA-turns) real(dp), dimension(ngc2) :: rjconpf @@ -474,7 +474,7 @@ subroutine init_pfcoil_variables powpfres = 0.0D0 r_pf_coil_inner = 0.0D0 r_pf_coil_outer = 0.0D0 - ric = 0.0D0 + c_pf_cs_coils_peak_ma = 0.0D0 rjconpf = (/3.0D7, 3.0D7, 3.0D7, & 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, & 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, & diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index e7c5948b8e..258043cb6f 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -4219,7 +4219,7 @@ "rhopedt": 1.0, "rho_tf_bus": -1.0, "rho_tf_leg": 0.0, - "ric": 0.0, + "c_pf_cs_coils_peak_ma": 0.0, "ricpf": 0.0, "rinboard": 0.651, "ripflag": 0, @@ -10526,7 +10526,7 @@ "rhopedt": "r/a of temperature pedestal (`ipedestal>=1`)", "rho_tf_bus": "Resistivity of a TF coil bus (Ohm-m). Default value takes the same res as the leg one", "rho_tf_leg": "Resistivity of a TF coil leg (Ohm-m)", - "ric": "peak current in coil i (MA-turns)", + "c_pf_cs_coils_peak_ma": "peak current in coil i (MA-turns)", "ricpf": "", "rinboard": "plasma inboard radius (m) (`consistency equation 29`)", "ripflag": "", @@ -18975,7 +18975,7 @@ "powpfres", "r_pf_coil_inner", "r_pf_coil_outer", - "ric", + "c_pf_cs_coils_peak_ma", "rjconpf", "rjohc", "rjohc0", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 82a8ca1e49..9f12dc754d 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -79,7 +79,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "powpfres", 0.0) monkeypatch.setattr(pfv, "curpfb", np.full(22, 0.0)) monkeypatch.setattr(pfv, "routr", 1.5) - monkeypatch.setattr(pfv, "ric", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "c_pf_cs_coils_peak_ma", np.full(22, 0.0)) monkeypatch.setattr(pfv, "fcohbof", 2.654e-1) monkeypatch.setattr(pfv, "rpf2", -1.825) monkeypatch.setattr(pfv, "nfxfh", 7) @@ -216,7 +216,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "j_pf_wp_critical", np.full(22, 0.0)) monkeypatch.setattr(pfv, "rho_pf_coil", 2.8e-8) monkeypatch.setattr(pfv, "vf", np.full(22, 0.3)) - monkeypatch.setattr(pfv, "ric", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "c_pf_cs_coils_peak_ma", np.full(22, 0.0)) monkeypatch.setattr(pfv, "bpf", np.full(22, 0.0)) monkeypatch.setattr(pfv, "jscoh_eof", 4.758e8) monkeypatch.setattr(pfv, "z_pf_coil_middle", np.full(22, 0.0)) @@ -2250,7 +2250,7 @@ def test_peakb(monkeypatch: pytest.MonkeyPatch, pfcoil: PFCoil): monkeypatch.setattr(pfv, "n_cs_pf_coils", 7) monkeypatch.setattr( pfv, - "ric", + "c_pf_cs_coils_peak_ma", np.array([ 14.742063826112622, 20.032681634901664, @@ -2677,7 +2677,7 @@ def test_axial_stress(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): ) monkeypatch.setattr( pfv, - "ric", + "c_pf_cs_coils_peak_ma", np.array([ 14.742063826112622, 20.032681634901664, diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 4e6485d3a0..05bb27390c 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -2038,7 +2038,7 @@ class Acc2222Param(NamedTuple): m_pf_coil_structure_total: Any = None - ric: Any = None + c_pf_cs_coils_peak_ma: Any = None r_pf_coil_middle: Any = None @@ -2164,7 +2164,7 @@ class Acc2222Param(NamedTuple): ).transpose(), i_pf_superconductor=3, m_pf_coil_structure_total=2695737.563343476, - ric=np.array( + c_pf_cs_coils_peak_ma=np.array( np.array( ( 14.742063826112622, @@ -2360,7 +2360,7 @@ class Acc2222Param(NamedTuple): ).transpose(), i_pf_superconductor=3, m_pf_coil_structure_total=2510424.9065680322, - ric=np.array( + c_pf_cs_coils_peak_ma=np.array( np.array( ( 18.579095475129446, @@ -2556,7 +2556,7 @@ class Acc2222Param(NamedTuple): ).transpose(), i_pf_superconductor=3, m_pf_coil_structure_total=2510424.9065680322, - ric=np.array( + c_pf_cs_coils_peak_ma=np.array( np.array( ( 18.579095475129446, @@ -2735,7 +2735,9 @@ def test_acc2222(acc2222param, monkeypatch, costs): acc2222param.m_pf_coil_structure_total, ) - monkeypatch.setattr(pfcoil_variables, "ric", acc2222param.ric) + monkeypatch.setattr( + pfcoil_variables, "c_pf_cs_coils_peak_ma", acc2222param.c_pf_cs_coils_peak_ma + ) monkeypatch.setattr( pfcoil_variables, "r_pf_coil_middle", acc2222param.r_pf_coil_middle diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index 65d03312f8..eb5cc7fc70 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1054,7 +1054,7 @@ def test_waveform(monkeypatch, pfcoil): discovered using gdb to break on the first subroutine call when running the baseline 2018 IN.DAT. - waveform() alters both ric and waves in the pfcoil_variables module, so + waveform() alters both c_pf_cs_coils_peak_ma and waves in the pfcoil_variables module, so these are asserted on. :param monkeypatch: mocking fixture :type monkeypatch: _pytest.monkeypatch.MonkeyPatch @@ -1062,7 +1062,7 @@ def test_waveform(monkeypatch, pfcoil): :type pfcoil: process.pfcoil.PFCoil """ ngc2 = 22 - monkeypatch.setattr(pfv, "ric", np.zeros(ngc2, dtype=int)) + monkeypatch.setattr(pfv, "c_pf_cs_coils_peak_ma", np.zeros(ngc2, dtype=int)) monkeypatch.setattr(pfv, "n_cs_pf_coils", 7) monkeypatch.setattr(pfv, "waves", np.zeros((ngc2, 6), order="F")) monkeypatch.setattr( @@ -1203,7 +1203,7 @@ def test_waveform(monkeypatch, pfcoil): pfcoil.waveform() - assert_array_almost_equal(pfv.ric, ric_exp) + assert_array_almost_equal(pfv.c_pf_cs_coils_peak_ma, ric_exp) assert_array_almost_equal(pfv.waves, waves_exp) diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index d08bfb0da6..b2ce76fb7d 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -203,7 +203,7 @@ class PfpwrParam(NamedTuple): n_pf_coils_in_group: Any = None - ric: Any = None + c_pf_cs_coils_peak_ma: Any = None etapsu: Any = None @@ -436,7 +436,7 @@ class PfpwrParam(NamedTuple): n_pf_coils_in_group=np.array( np.array((1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0), order="F"), order="F" ).transpose(), - ric=np.array( + c_pf_cs_coils_peak_ma=np.array( np.array( ( 14.742063826112622, @@ -1179,7 +1179,7 @@ class PfpwrParam(NamedTuple): n_pf_coils_in_group=np.array( np.array((1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0), order="F"), order="F" ).transpose(), - ric=np.array( + c_pf_cs_coils_peak_ma=np.array( np.array( ( 18.579095475129442, @@ -1814,7 +1814,9 @@ def test_pfpwr(pfpwrparam, monkeypatch, power): pfcoil_variables, "n_pf_coils_in_group", pfpwrparam.n_pf_coils_in_group ) - monkeypatch.setattr(pfcoil_variables, "ric", pfpwrparam.ric) + monkeypatch.setattr( + pfcoil_variables, "c_pf_cs_coils_peak_ma", pfpwrparam.c_pf_cs_coils_peak_ma + ) monkeypatch.setattr(pfcoil_variables, "etapsu", pfpwrparam.etapsu) diff --git a/tests/unit/test_pulse.py b/tests/unit/test_pulse.py index d8e000c15e..e23ad59083 100644 --- a/tests/unit/test_pulse.py +++ b/tests/unit/test_pulse.py @@ -42,7 +42,7 @@ class TohswgParam(NamedTuple): c_pf_coil_turn: Any = None - ric: Any = None + c_pf_cs_coils_peak_ma: Any = None n_pf_coil_turns: Any = None @@ -463,7 +463,7 @@ class BurnParam(NamedTuple): ), order="F", ).transpose(), - ric=np.array( + c_pf_cs_coils_peak_ma=np.array( np.array( ( 14.742063826112572, @@ -1021,7 +1021,7 @@ class BurnParam(NamedTuple): ), order="F", ).transpose(), - ric=np.array( + c_pf_cs_coils_peak_ma=np.array( np.array( ( 18.585545191033798, @@ -1249,7 +1249,9 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): monkeypatch.setattr(pfcoil_variables, "c_pf_coil_turn", tohswgparam.c_pf_coil_turn) - monkeypatch.setattr(pfcoil_variables, "ric", tohswgparam.ric) + monkeypatch.setattr( + pfcoil_variables, "c_pf_cs_coils_peak_ma", tohswgparam.c_pf_cs_coils_peak_ma + ) monkeypatch.setattr( pfcoil_variables, "n_pf_coil_turns", tohswgparam.n_pf_coil_turns From 2dce5553bf582f2b8703b500a8a746fabe059f28 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 16:09:41 +0000 Subject: [PATCH 34/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'curpfb'=20to=20'?= =?UTF-8?q?c=5Fpf=5Fcs=5Fcoil=5Fpulse=5Fstart=5Fma'=20across=20multiple=20?= =?UTF-8?q?files=20for=20consistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 32 +++++++++++++------ source/fortran/pfcoil_variables.f90 | 6 ++-- tests/integration/ref_dicts.json | 8 ++--- tests/integration/test_pfcoil_int.py | 6 ++-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_pfcoil.py | 2 +- 6 files changed, 35 insertions(+), 21 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index 8e2f2f4b38..4c326975a3 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -510,7 +510,7 @@ def pfcoil(self): pf.ccls[nng] = 1.0e6 * pfv.ccls_ma[nng] # Beginning of pulse: t = tv.t_precharge - pfv.curpfb[ncl] = 1.0e-6 * pf.ccl0[nng] + pfv.c_pf_cs_coil_pulse_start_ma[ncl] = 1.0e-6 * pf.ccl0[nng] # Beginning of flat-top: t = tv.t_precharge+tv.t_current_ramp_up pfv.curpff[ncl] = 1.0e-6 * ( @@ -526,7 +526,7 @@ def pfcoil(self): # Current in Central Solenoid as a function of time # N.B. If the Central Solenoid is not present then ioheof is zero. - pfv.curpfb[ncl] = -1.0e-6 * ioheof * pfv.fcohbop + pfv.c_pf_cs_coil_pulse_start_ma[ncl] = -1.0e-6 * ioheof * pfv.fcohbop pfv.curpff[ncl] = 1.0e-6 * ioheof * pfv.fcohbof pfv.curpfs[ncl] = 1.0e-6 * ioheof @@ -676,7 +676,13 @@ def pfcoil(self): pfv.powpfres = ( pfv.powpfres - + respf * (1.0e6 * pfv.curpfb[i] / pfv.n_pf_coil_turns[i]) ** 2 + + respf + * ( + 1.0e6 + * pfv.c_pf_cs_coil_pulse_start_ma[i] + / pfv.n_pf_coil_turns[i] + ) + ** 2 ) # Winding pack volume @@ -1321,7 +1327,13 @@ def peakb(self, i, ii, it): kk = 0 else: # Check different times for maximum current - if abs(pfv.curpfb[i - 1] - pfv.c_pf_cs_coils_peak_ma[i - 1]) < 1.0e-12: + if ( + abs( + pfv.c_pf_cs_coil_pulse_start_ma[i - 1] + - pfv.c_pf_cs_coils_peak_ma[i - 1] + ) + < 1.0e-12 + ): it = 2 elif abs(pfv.curpff[i - 1] - pfv.c_pf_cs_coils_peak_ma[i - 1]) < 1.0e-12: it = 4 @@ -2815,13 +2827,13 @@ def waveform(self): for ic in range(pfv.n_cs_pf_coils): # Find where the peak current occurs # Beginning of pulse, t = t_precharge - if (abs(pfv.curpfb[ic]) >= abs(pfv.curpfs[ic])) and ( - abs(pfv.curpfb[ic]) >= abs(pfv.curpff[ic]) + if (abs(pfv.c_pf_cs_coil_pulse_start_ma[ic]) >= abs(pfv.curpfs[ic])) and ( + abs(pfv.c_pf_cs_coil_pulse_start_ma[ic]) >= abs(pfv.curpff[ic]) ): - pfv.c_pf_cs_coils_peak_ma[ic] = pfv.curpfb[ic] + pfv.c_pf_cs_coils_peak_ma[ic] = pfv.c_pf_cs_coil_pulse_start_ma[ic] # Beginning of flat-top, t = t_precharge + t_current_ramp_up - if (abs(pfv.curpff[ic]) >= abs(pfv.curpfb[ic])) and ( + if (abs(pfv.curpff[ic]) >= abs(pfv.c_pf_cs_coil_pulse_start_ma[ic])) and ( abs(pfv.curpff[ic]) >= abs(pfv.curpfs[ic]) ): pfv.c_pf_cs_coils_peak_ma[ic] = pfv.curpff[ic] @@ -2834,7 +2846,9 @@ def waveform(self): # Set normalized current waveforms pfv.waves[ic, 0] = 0.0e0 - pfv.waves[ic, 1] = pfv.curpfb[ic] / pfv.c_pf_cs_coils_peak_ma[ic] + pfv.waves[ic, 1] = ( + pfv.c_pf_cs_coil_pulse_start_ma[ic] / pfv.c_pf_cs_coils_peak_ma[ic] + ) pfv.waves[ic, 2] = pfv.curpff[ic] / pfv.c_pf_cs_coils_peak_ma[ic] pfv.waves[ic, 3] = pfv.curpff[ic] / pfv.c_pf_cs_coils_peak_ma[ic] pfv.waves[ic, 4] = pfv.curpfs[ic] / pfv.c_pf_cs_coils_peak_ma[ic] diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index c43ca2cd32..63c31ad103 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -83,7 +83,7 @@ module pfcoil_variables real(dp), dimension(ngc2) :: cptdin !! peak current per turn input for PF coil i (A) - real(dp), dimension(ngc2) :: curpfb + real(dp), dimension(ngc2) :: c_pf_cs_coil_pulse_start_ma !! PF coil current array, at beginning of pulse (MA) !! Indexed by coil number, not group number @@ -172,7 +172,7 @@ module pfcoil_variables integer :: i_pf_current !! Switch for controlling the current of the PF coils: !! - !! - =0 Input via the variables curpfb, curpff, curpfs + !! - =0 Input via the variables c_pf_cs_coil_pulse_start_ma, curpff, curpfs !! - =1 SVD targets zero field across midplane (flux swing !! coils) and the correct vertical field at the plasma !! center (equilibrium coils) @@ -434,7 +434,7 @@ subroutine init_pfcoil_variables 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, & 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, & 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4/) - curpfb = 0.0D0 + c_pf_cs_coil_pulse_start_ma = 0.0D0 curpff = 0.0D0 curpfs = 0.0D0 etapsu = 0.9D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 258043cb6f..14a23d9379 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1576,7 +1576,7 @@ "cturbb": 38.0, "ctwo": "(2.0_wp_, 0.0_wp_)", "cunit": "(1.0_wp_, 0.0_wp_)", - "curpfb": 0.0, + "c_pf_cs_coil_pulse_start_ma": 0.0, "curpff": 0.0, "curpfs": 0.0, "curr1_": "e_*vte1_", @@ -9238,7 +9238,7 @@ "cturbb": "cost of turbine building (M$)", "ctwo": "", "cunit": "", - "curpfb": "PF coil current array, at beginning of pulse (MA)\n Indexed by coil number, not group number", + "c_pf_cs_coil_pulse_start_ma": "PF coil current array, at beginning of pulse (MA)\n Indexed by coil number, not group number", "curpff": "PF coil current array, at flat top (MA)\n Indexed by coil number, not group number", "curpfs": "PF coil current array, at end of pulse (MA)\n Indexed by coil number, not group number", "curr1_": "", @@ -9790,7 +9790,7 @@ "i_cp_joints": "Switch for CP demoutable joints type\n -= 0 : Clampled joints\n -= 1 : Sliding joints\n Default value (-1) choses :\n Sliding joints for resistive magnets (i_tf_sup = 0, 2)\n Clampled joints for superconducting magents (i_tf_sup = 1)", "i_cp_lifetime": "Switch for the centrepost lifetime constraint\n 0 : The CP full power year lifetime is set by the user via cplife_input\n 1 : The CP lifetime is equal to the divertor lifetime\n 2 : The CP lifetime is equal to the breeding blankets lifetime\n 3 : The CP lifetime is equal to the plant lifetime", "i_cs_stress": "Switch for CS stress calculation:\n
            \n
          • =0 Hoop stress only
            • \n
          • =1 Hoop + Axial stress
            • \n
          ", - "i_pf_current": "Switch for controlling the current of the PF coils:\n
            \n
          • =0 Input via the variables curpfb, curpff, curpfs
            • \n
          • =1 SVD targets zero field across midplane (flux swing\n coils) and the correct vertical field at the plasma\n center (equilibrium coils)
            • \n
          ", + "i_pf_current": "Switch for controlling the current of the PF coils:\n
            \n
          • =0 Input via the variables c_pf_cs_coil_pulse_start_ma, curpff, curpfs
            • \n
          • =1 SVD targets zero field across midplane (flux swing\n coils) and the correct vertical field at the plasma\n center (equilibrium coils)
            • \n
          ", "i_r_cp_top": "Switch selecting the he parametrization of the outer radius of the top of the CP part of the TF coil\n 0 : `r_cp_top` is set by the plasma shape\n 1 : `r_cp_top` is a user input\n 2 : `r_cp_top` is set using the CP top and midplane CP radius ratio", "i_shield_mat": "Switch for shield material - currently only applied in costing routines `cost_model = 2`\n
            \n
          • =0 Tungsten (default)
            • \n
          • =1 Tungsten carbide
            • \n
          ", "i_single_null": "switch for single null / double null plasma:\n
            \n
          • =0 for double null
            • \n
          • =1 for single null (diverted side down)
            • \n
          ", @@ -18939,7 +18939,7 @@ "j_cs_flat_top_end", "c_pf_coil_turn", "cptdin", - "curpfb", + "c_pf_cs_coil_pulse_start_ma", "curpff", "curpfs", "etapsu", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 9f12dc754d..bb85411260 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -77,7 +77,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "i_pf_location", np.array([2, 2, 3, 3, 0, 0, 0, 0, 0, 0])) monkeypatch.setattr(pfv, "m_pf_coil_structure", np.full(22, 0.0)) monkeypatch.setattr(pfv, "powpfres", 0.0) - monkeypatch.setattr(pfv, "curpfb", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "c_pf_cs_coil_pulse_start_ma", np.full(22, 0.0)) monkeypatch.setattr(pfv, "routr", 1.5) monkeypatch.setattr(pfv, "c_pf_cs_coils_peak_ma", np.full(22, 0.0)) monkeypatch.setattr(pfv, "fcohbof", 2.654e-1) @@ -250,7 +250,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr( pfv, "n_pf_coils_in_group", np.array([1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0]) ) - monkeypatch.setattr(pfv, "curpfb", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "c_pf_cs_coil_pulse_start_ma", np.full(22, 0.0)) monkeypatch.setattr(pfv, "curpff", np.full(22, 0.0)) monkeypatch.setattr(pfv, "curpfs", np.full(22, -175.84911993600002)) monkeypatch.setattr(pv, "rmajor", 8.938) @@ -2428,7 +2428,7 @@ def test_peakb(monkeypatch: pytest.MonkeyPatch, pfcoil: PFCoil): ) monkeypatch.setattr( pfv, - "curpfb", + "c_pf_cs_coil_pulse_start_ma", np.array([ 14.742063826112622, 20.032681634901664, diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index e8fc11cdb3..8acda270f7 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1887,7 +1887,7 @@ i_pf_superconductor = 9 *i_pf_current = * DESCRIPTION: Switch for controlling the current of the PF coils: (default = 1) -* =0 Input via the variables curpfb, curpff, curpfs +* =0 Input via the variables c_pf_cs_coil_pulse_start_ma, curpff, curpfs * =1 SVD targets zero field across midplane (flux swing * coils) and the correct vertical field at the plasma * center (equilibrium coils) diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index eb5cc7fc70..ab6a578eed 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1067,7 +1067,7 @@ def test_waveform(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "waves", np.zeros((ngc2, 6), order="F")) monkeypatch.setattr( pfv, - "curpfb", + "c_pf_cs_coil_pulse_start_ma", np.array([ 0.067422231232391661, -2.9167273287450968, From 09a5b63d604513d631d0f99947a9eac8cdeca906 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 16:11:14 +0000 Subject: [PATCH 35/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'curpff'=20to=20'?= =?UTF-8?q?c=5Fpf=5Fcs=5Fcoil=5Fflat=5Ftop=5Fma'=20across=20multiple=20fil?= =?UTF-8?q?es=20for=20consistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 34 +++++++++++++------ source/fortran/pfcoil_variables.f90 | 6 ++-- tests/integration/ref_dicts.json | 8 ++--- tests/integration/test_pfcoil_int.py | 6 ++-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_pfcoil.py | 2 +- 6 files changed, 35 insertions(+), 23 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index 4c326975a3..0db7a13ced 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -513,7 +513,7 @@ def pfcoil(self): pfv.c_pf_cs_coil_pulse_start_ma[ncl] = 1.0e-6 * pf.ccl0[nng] # Beginning of flat-top: t = tv.t_precharge+tv.t_current_ramp_up - pfv.curpff[ncl] = 1.0e-6 * ( + pfv.c_pf_cs_coil_flat_top_ma[ncl] = 1.0e-6 * ( pf.ccls[nng] - (pf.ccl0[nng] * pfv.fcohbof / pfv.fcohbop) ) @@ -527,7 +527,7 @@ def pfcoil(self): # Current in Central Solenoid as a function of time # N.B. If the Central Solenoid is not present then ioheof is zero. pfv.c_pf_cs_coil_pulse_start_ma[ncl] = -1.0e-6 * ioheof * pfv.fcohbop - pfv.curpff[ncl] = 1.0e-6 * ioheof * pfv.fcohbof + pfv.c_pf_cs_coil_flat_top_ma[ncl] = 1.0e-6 * ioheof * pfv.fcohbof pfv.curpfs[ncl] = 1.0e-6 * ioheof # Set up coil current waveforms, normalised to the peak current in @@ -1335,7 +1335,13 @@ def peakb(self, i, ii, it): < 1.0e-12 ): it = 2 - elif abs(pfv.curpff[i - 1] - pfv.c_pf_cs_coils_peak_ma[i - 1]) < 1.0e-12: + elif ( + abs( + pfv.c_pf_cs_coil_flat_top_ma[i - 1] + - pfv.c_pf_cs_coils_peak_ma[i - 1] + ) + < 1.0e-12 + ): it = 4 elif abs(pfv.curpfs[i - 1] - pfv.c_pf_cs_coils_peak_ma[i - 1]) < 1.0e-12: it = 5 @@ -2828,19 +2834,21 @@ def waveform(self): # Find where the peak current occurs # Beginning of pulse, t = t_precharge if (abs(pfv.c_pf_cs_coil_pulse_start_ma[ic]) >= abs(pfv.curpfs[ic])) and ( - abs(pfv.c_pf_cs_coil_pulse_start_ma[ic]) >= abs(pfv.curpff[ic]) + abs(pfv.c_pf_cs_coil_pulse_start_ma[ic]) + >= abs(pfv.c_pf_cs_coil_flat_top_ma[ic]) ): pfv.c_pf_cs_coils_peak_ma[ic] = pfv.c_pf_cs_coil_pulse_start_ma[ic] # Beginning of flat-top, t = t_precharge + t_current_ramp_up - if (abs(pfv.curpff[ic]) >= abs(pfv.c_pf_cs_coil_pulse_start_ma[ic])) and ( - abs(pfv.curpff[ic]) >= abs(pfv.curpfs[ic]) - ): - pfv.c_pf_cs_coils_peak_ma[ic] = pfv.curpff[ic] + if ( + abs(pfv.c_pf_cs_coil_flat_top_ma[ic]) + >= abs(pfv.c_pf_cs_coil_pulse_start_ma[ic]) + ) and (abs(pfv.c_pf_cs_coil_flat_top_ma[ic]) >= abs(pfv.curpfs[ic])): + pfv.c_pf_cs_coils_peak_ma[ic] = pfv.c_pf_cs_coil_flat_top_ma[ic] # End of flat-top, t = t_precharge + t_current_ramp_up + t_fusion_ramp + t_burn if (abs(pfv.curpfs[ic]) >= abs(pfv.curpfs[ic])) and ( - abs(pfv.curpfs[ic]) >= abs(pfv.curpff[ic]) + abs(pfv.curpfs[ic]) >= abs(pfv.c_pf_cs_coil_flat_top_ma[ic]) ): pfv.c_pf_cs_coils_peak_ma[ic] = pfv.curpfs[ic] @@ -2849,8 +2857,12 @@ def waveform(self): pfv.waves[ic, 1] = ( pfv.c_pf_cs_coil_pulse_start_ma[ic] / pfv.c_pf_cs_coils_peak_ma[ic] ) - pfv.waves[ic, 2] = pfv.curpff[ic] / pfv.c_pf_cs_coils_peak_ma[ic] - pfv.waves[ic, 3] = pfv.curpff[ic] / pfv.c_pf_cs_coils_peak_ma[ic] + pfv.waves[ic, 2] = ( + pfv.c_pf_cs_coil_flat_top_ma[ic] / pfv.c_pf_cs_coils_peak_ma[ic] + ) + pfv.waves[ic, 3] = ( + pfv.c_pf_cs_coil_flat_top_ma[ic] / pfv.c_pf_cs_coils_peak_ma[ic] + ) pfv.waves[ic, 4] = pfv.curpfs[ic] / pfv.c_pf_cs_coils_peak_ma[ic] pfv.waves[ic, 5] = 0.0e0 diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 63c31ad103..da1f404f0f 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -87,7 +87,7 @@ module pfcoil_variables !! PF coil current array, at beginning of pulse (MA) !! Indexed by coil number, not group number - real(dp), dimension(ngc2) :: curpff + real(dp), dimension(ngc2) :: c_pf_cs_coil_flat_top_ma !! PF coil current array, at flat top (MA) !! Indexed by coil number, not group number @@ -172,7 +172,7 @@ module pfcoil_variables integer :: i_pf_current !! Switch for controlling the current of the PF coils: !! - !! - =0 Input via the variables c_pf_cs_coil_pulse_start_ma, curpff, curpfs + !! - =0 Input via the variables c_pf_cs_coil_pulse_start_ma, c_pf_cs_coil_flat_top_ma, curpfs !! - =1 SVD targets zero field across midplane (flux swing !! coils) and the correct vertical field at the plasma !! center (equilibrium coils) @@ -435,7 +435,7 @@ subroutine init_pfcoil_variables 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, & 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4/) c_pf_cs_coil_pulse_start_ma = 0.0D0 - curpff = 0.0D0 + c_pf_cs_coil_flat_top_ma = 0.0D0 curpfs = 0.0D0 etapsu = 0.9D0 fcohbof = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 14a23d9379..149bd2df48 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1577,7 +1577,7 @@ "ctwo": "(2.0_wp_, 0.0_wp_)", "cunit": "(1.0_wp_, 0.0_wp_)", "c_pf_cs_coil_pulse_start_ma": 0.0, - "curpff": 0.0, + "c_pf_cs_coil_flat_top_ma": 0.0, "curpfs": 0.0, "curr1_": "e_*vte1_", "f_vol_plasma": 1.0, @@ -9239,7 +9239,7 @@ "ctwo": "", "cunit": "", "c_pf_cs_coil_pulse_start_ma": "PF coil current array, at beginning of pulse (MA)\n Indexed by coil number, not group number", - "curpff": "PF coil current array, at flat top (MA)\n Indexed by coil number, not group number", + "c_pf_cs_coil_flat_top_ma": "PF coil current array, at flat top (MA)\n Indexed by coil number, not group number", "curpfs": "PF coil current array, at end of pulse (MA)\n Indexed by coil number, not group number", "curr1_": "", "f_vol_plasma": "multiplying factor times plasma volume (normally=1)", @@ -9790,7 +9790,7 @@ "i_cp_joints": "Switch for CP demoutable joints type\n -= 0 : Clampled joints\n -= 1 : Sliding joints\n Default value (-1) choses :\n Sliding joints for resistive magnets (i_tf_sup = 0, 2)\n Clampled joints for superconducting magents (i_tf_sup = 1)", "i_cp_lifetime": "Switch for the centrepost lifetime constraint\n 0 : The CP full power year lifetime is set by the user via cplife_input\n 1 : The CP lifetime is equal to the divertor lifetime\n 2 : The CP lifetime is equal to the breeding blankets lifetime\n 3 : The CP lifetime is equal to the plant lifetime", "i_cs_stress": "Switch for CS stress calculation:\n
            \n
          • =0 Hoop stress only
            • \n
          • =1 Hoop + Axial stress
            • \n
          ", - "i_pf_current": "Switch for controlling the current of the PF coils:\n
            \n
          • =0 Input via the variables c_pf_cs_coil_pulse_start_ma, curpff, curpfs
            • \n
          • =1 SVD targets zero field across midplane (flux swing\n coils) and the correct vertical field at the plasma\n center (equilibrium coils)
            • \n
          ", + "i_pf_current": "Switch for controlling the current of the PF coils:\n
            \n
          • =0 Input via the variables c_pf_cs_coil_pulse_start_ma, c_pf_cs_coil_flat_top_ma, curpfs
            • \n
          • =1 SVD targets zero field across midplane (flux swing\n coils) and the correct vertical field at the plasma\n center (equilibrium coils)
            • \n
          ", "i_r_cp_top": "Switch selecting the he parametrization of the outer radius of the top of the CP part of the TF coil\n 0 : `r_cp_top` is set by the plasma shape\n 1 : `r_cp_top` is a user input\n 2 : `r_cp_top` is set using the CP top and midplane CP radius ratio", "i_shield_mat": "Switch for shield material - currently only applied in costing routines `cost_model = 2`\n
            \n
          • =0 Tungsten (default)
            • \n
          • =1 Tungsten carbide
            • \n
          ", "i_single_null": "switch for single null / double null plasma:\n
            \n
          • =0 for double null
            • \n
          • =1 for single null (diverted side down)
            • \n
          ", @@ -18940,7 +18940,7 @@ "c_pf_coil_turn", "cptdin", "c_pf_cs_coil_pulse_start_ma", - "curpff", + "c_pf_cs_coil_flat_top_ma", "curpfs", "etapsu", "fcohbof", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index bb85411260..deb9d31fd9 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -58,7 +58,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(fwbsv, "denstl", 7.8e3) monkeypatch.setattr(pfv, "rpf1", 0.0) monkeypatch.setattr(pfv, "m_pf_coil_structure_total", 0.0) - monkeypatch.setattr(pfv, "curpff", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "c_pf_cs_coil_flat_top_ma", np.full(22, 0.0)) monkeypatch.setattr(pfv, "n_cs_pf_coils", 0) monkeypatch.setattr(pfv, "r_pf_coil_outer_max", 0.0) monkeypatch.setattr(pfv, "fcohbop", 1.0) @@ -251,7 +251,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): pfv, "n_pf_coils_in_group", np.array([1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0]) ) monkeypatch.setattr(pfv, "c_pf_cs_coil_pulse_start_ma", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "curpff", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "c_pf_cs_coil_flat_top_ma", np.full(22, 0.0)) monkeypatch.setattr(pfv, "curpfs", np.full(22, -175.84911993600002)) monkeypatch.setattr(pv, "rmajor", 8.938) monkeypatch.setattr(pv, "plasma_current", 1.8254e7) @@ -2456,7 +2456,7 @@ def test_peakb(monkeypatch: pytest.MonkeyPatch, pfcoil: PFCoil): ) monkeypatch.setattr( pfv, - "curpff", + "c_pf_cs_coil_flat_top_ma", np.array([ 0.067422231232391661, -2.9167273287450968, diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 8acda270f7..b67d65fc12 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1887,7 +1887,7 @@ i_pf_superconductor = 9 *i_pf_current = * DESCRIPTION: Switch for controlling the current of the PF coils: (default = 1) -* =0 Input via the variables c_pf_cs_coil_pulse_start_ma, curpff, curpfs +* =0 Input via the variables c_pf_cs_coil_pulse_start_ma, c_pf_cs_coil_flat_top_ma, curpfs * =1 SVD targets zero field across midplane (flux swing * coils) and the correct vertical field at the plasma * center (equilibrium coils) diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index ab6a578eed..6aecd05094 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1095,7 +1095,7 @@ def test_waveform(monkeypatch, pfcoil): ) monkeypatch.setattr( pfv, - "curpff", + "c_pf_cs_coil_flat_top_ma", np.array([ 0.067422231232391661, -2.9167273287450968, From 3d267a91af6c90c9d22e576c5050dbb8e4336245 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 16:12:34 +0000 Subject: [PATCH 36/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'curpfs'=20to=20'?= =?UTF-8?q?c=5Fpf=5Fcs=5Fcoil=5Fpulse=5Fend=5Fma'=20across=20multiple=20fi?= =?UTF-8?q?les=20for=20consistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 36 ++++++++++++++----- process/power.py | 2 +- source/fortran/pfcoil_variables.f90 | 6 ++-- tests/integration/ref_dicts.json | 8 ++--- tests/integration/test_pfcoil_int.py | 8 +++-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_pfcoil.py | 2 +- tests/unit/test_power.py | 12 ++++--- 8 files changed, 50 insertions(+), 26 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index 0db7a13ced..bb2c72a105 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -518,7 +518,7 @@ def pfcoil(self): ) # End of flat-top: t = tv.t_precharge+tv.t_current_ramp_up+tv.t_fusion_ramp+tv.t_burn - pfv.curpfs[ncl] = 1.0e-6 * ( + pfv.c_pf_cs_coil_pulse_end_ma[ncl] = 1.0e-6 * ( pf.ccls[nng] - (pf.ccl0[nng] * (1.0e0 / pfv.fcohbop)) ) @@ -528,7 +528,7 @@ def pfcoil(self): # N.B. If the Central Solenoid is not present then ioheof is zero. pfv.c_pf_cs_coil_pulse_start_ma[ncl] = -1.0e-6 * ioheof * pfv.fcohbop pfv.c_pf_cs_coil_flat_top_ma[ncl] = 1.0e-6 * ioheof * pfv.fcohbof - pfv.curpfs[ncl] = 1.0e-6 * ioheof + pfv.c_pf_cs_coil_pulse_end_ma[ncl] = 1.0e-6 * ioheof # Set up coil current waveforms, normalised to the peak current in # each coil @@ -1343,7 +1343,13 @@ def peakb(self, i, ii, it): < 1.0e-12 ): it = 4 - elif abs(pfv.curpfs[i - 1] - pfv.c_pf_cs_coils_peak_ma[i - 1]) < 1.0e-12: + elif ( + abs( + pfv.c_pf_cs_coil_pulse_end_ma[i - 1] + - pfv.c_pf_cs_coils_peak_ma[i - 1] + ) + < 1.0e-12 + ): it = 5 else: eh.idiags[0] = it @@ -2833,7 +2839,10 @@ def waveform(self): for ic in range(pfv.n_cs_pf_coils): # Find where the peak current occurs # Beginning of pulse, t = t_precharge - if (abs(pfv.c_pf_cs_coil_pulse_start_ma[ic]) >= abs(pfv.curpfs[ic])) and ( + if ( + abs(pfv.c_pf_cs_coil_pulse_start_ma[ic]) + >= abs(pfv.c_pf_cs_coil_pulse_end_ma[ic]) + ) and ( abs(pfv.c_pf_cs_coil_pulse_start_ma[ic]) >= abs(pfv.c_pf_cs_coil_flat_top_ma[ic]) ): @@ -2843,14 +2852,21 @@ def waveform(self): if ( abs(pfv.c_pf_cs_coil_flat_top_ma[ic]) >= abs(pfv.c_pf_cs_coil_pulse_start_ma[ic]) - ) and (abs(pfv.c_pf_cs_coil_flat_top_ma[ic]) >= abs(pfv.curpfs[ic])): + ) and ( + abs(pfv.c_pf_cs_coil_flat_top_ma[ic]) + >= abs(pfv.c_pf_cs_coil_pulse_end_ma[ic]) + ): pfv.c_pf_cs_coils_peak_ma[ic] = pfv.c_pf_cs_coil_flat_top_ma[ic] # End of flat-top, t = t_precharge + t_current_ramp_up + t_fusion_ramp + t_burn - if (abs(pfv.curpfs[ic]) >= abs(pfv.curpfs[ic])) and ( - abs(pfv.curpfs[ic]) >= abs(pfv.c_pf_cs_coil_flat_top_ma[ic]) + if ( + abs(pfv.c_pf_cs_coil_pulse_end_ma[ic]) + >= abs(pfv.c_pf_cs_coil_pulse_end_ma[ic]) + ) and ( + abs(pfv.c_pf_cs_coil_pulse_end_ma[ic]) + >= abs(pfv.c_pf_cs_coil_flat_top_ma[ic]) ): - pfv.c_pf_cs_coils_peak_ma[ic] = pfv.curpfs[ic] + pfv.c_pf_cs_coils_peak_ma[ic] = pfv.c_pf_cs_coil_pulse_end_ma[ic] # Set normalized current waveforms pfv.waves[ic, 0] = 0.0e0 @@ -2863,7 +2879,9 @@ def waveform(self): pfv.waves[ic, 3] = ( pfv.c_pf_cs_coil_flat_top_ma[ic] / pfv.c_pf_cs_coils_peak_ma[ic] ) - pfv.waves[ic, 4] = pfv.curpfs[ic] / pfv.c_pf_cs_coils_peak_ma[ic] + pfv.waves[ic, 4] = ( + pfv.c_pf_cs_coil_pulse_end_ma[ic] / pfv.c_pf_cs_coils_peak_ma[ic] + ) pfv.waves[ic, 5] = 0.0e0 def superconpf( diff --git a/process/power.py b/process/power.py index 2a88242fcc..1f04853fea 100644 --- a/process/power.py +++ b/process/power.py @@ -134,7 +134,7 @@ def pfpwr(self, output: bool): cktr[ig] = pfcr[ig] + pfbusr[ig] # total resistance of circuit (ohms) cptburn = ( pfcoil_variables.cptdin[ic] - * pfcoil_variables.curpfs[ic] + * pfcoil_variables.c_pf_cs_coil_pulse_end_ma[ic] / pfcoil_variables.c_pf_cs_coils_peak_ma[ic] ) rcktvm[ig] = abs(cptburn) * cktr[ig] # peak resistive voltage (V) diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index da1f404f0f..056a0a1c9a 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -91,7 +91,7 @@ module pfcoil_variables !! PF coil current array, at flat top (MA) !! Indexed by coil number, not group number - real(dp), dimension(ngc2) :: curpfs + real(dp), dimension(ngc2) :: c_pf_cs_coil_pulse_end_ma !! PF coil current array, at end of pulse (MA) !! Indexed by coil number, not group number @@ -172,7 +172,7 @@ module pfcoil_variables integer :: i_pf_current !! Switch for controlling the current of the PF coils: !! - !! - =0 Input via the variables c_pf_cs_coil_pulse_start_ma, c_pf_cs_coil_flat_top_ma, curpfs + !! - =0 Input via the variables c_pf_cs_coil_pulse_start_ma, c_pf_cs_coil_flat_top_ma, c_pf_cs_coil_pulse_end_ma !! - =1 SVD targets zero field across midplane (flux swing !! coils) and the correct vertical field at the plasma !! center (equilibrium coils) @@ -436,7 +436,7 @@ subroutine init_pfcoil_variables 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4/) c_pf_cs_coil_pulse_start_ma = 0.0D0 c_pf_cs_coil_flat_top_ma = 0.0D0 - curpfs = 0.0D0 + c_pf_cs_coil_pulse_end_ma = 0.0D0 etapsu = 0.9D0 fcohbof = 0.0D0 fcohbop = 0.9D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 149bd2df48..e614389059 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1578,7 +1578,7 @@ "cunit": "(1.0_wp_, 0.0_wp_)", "c_pf_cs_coil_pulse_start_ma": 0.0, "c_pf_cs_coil_flat_top_ma": 0.0, - "curpfs": 0.0, + "c_pf_cs_coil_pulse_end_ma": 0.0, "curr1_": "e_*vte1_", "f_vol_plasma": 1.0, "f_r_conducting_wall": 1.35, @@ -9240,7 +9240,7 @@ "cunit": "", "c_pf_cs_coil_pulse_start_ma": "PF coil current array, at beginning of pulse (MA)\n Indexed by coil number, not group number", "c_pf_cs_coil_flat_top_ma": "PF coil current array, at flat top (MA)\n Indexed by coil number, not group number", - "curpfs": "PF coil current array, at end of pulse (MA)\n Indexed by coil number, not group number", + "c_pf_cs_coil_pulse_end_ma": "PF coil current array, at end of pulse (MA)\n Indexed by coil number, not group number", "curr1_": "", "f_vol_plasma": "multiplying factor times plasma volume (normally=1)", "f_r_conducting_wall": "maximum ratio of conducting wall distance to plasma minor radius for\n vertical stability (`constraint equation 23`)", @@ -9790,7 +9790,7 @@ "i_cp_joints": "Switch for CP demoutable joints type\n -= 0 : Clampled joints\n -= 1 : Sliding joints\n Default value (-1) choses :\n Sliding joints for resistive magnets (i_tf_sup = 0, 2)\n Clampled joints for superconducting magents (i_tf_sup = 1)", "i_cp_lifetime": "Switch for the centrepost lifetime constraint\n 0 : The CP full power year lifetime is set by the user via cplife_input\n 1 : The CP lifetime is equal to the divertor lifetime\n 2 : The CP lifetime is equal to the breeding blankets lifetime\n 3 : The CP lifetime is equal to the plant lifetime", "i_cs_stress": "Switch for CS stress calculation:\n
            \n
          • =0 Hoop stress only
            • \n
          • =1 Hoop + Axial stress
            • \n
          ", - "i_pf_current": "Switch for controlling the current of the PF coils:\n
            \n
          • =0 Input via the variables c_pf_cs_coil_pulse_start_ma, c_pf_cs_coil_flat_top_ma, curpfs
            • \n
          • =1 SVD targets zero field across midplane (flux swing\n coils) and the correct vertical field at the plasma\n center (equilibrium coils)
            • \n
          ", + "i_pf_current": "Switch for controlling the current of the PF coils:\n
            \n
          • =0 Input via the variables c_pf_cs_coil_pulse_start_ma, c_pf_cs_coil_flat_top_ma, c_pf_cs_coil_pulse_end_ma
            • \n
          • =1 SVD targets zero field across midplane (flux swing\n coils) and the correct vertical field at the plasma\n center (equilibrium coils)
            • \n
          ", "i_r_cp_top": "Switch selecting the he parametrization of the outer radius of the top of the CP part of the TF coil\n 0 : `r_cp_top` is set by the plasma shape\n 1 : `r_cp_top` is a user input\n 2 : `r_cp_top` is set using the CP top and midplane CP radius ratio", "i_shield_mat": "Switch for shield material - currently only applied in costing routines `cost_model = 2`\n
            \n
          • =0 Tungsten (default)
            • \n
          • =1 Tungsten carbide
            • \n
          ", "i_single_null": "switch for single null / double null plasma:\n
            \n
          • =0 for double null
            • \n
          • =1 for single null (diverted side down)
            • \n
          ", @@ -18941,7 +18941,7 @@ "cptdin", "c_pf_cs_coil_pulse_start_ma", "c_pf_cs_coil_flat_top_ma", - "curpfs", + "c_pf_cs_coil_pulse_end_ma", "etapsu", "fcohbof", "fcohbop", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index deb9d31fd9..fc30e75acc 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -88,7 +88,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "m_pf_coil_conductor", np.full(22, 0.0)) monkeypatch.setattr(pfv, "vf", np.full(22, 3.0e-1)) monkeypatch.setattr(pfv, "n_pf_coil_turns", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "curpfs", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "c_pf_cs_coil_pulse_end_ma", np.full(22, 0.0)) monkeypatch.setattr(pfv, "r_pf_coil_middle", np.full(22, 0.0)) monkeypatch.setattr(pfv, "zref", [3.6, 1.2, 2.5, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0]) monkeypatch.setattr(pfv, "pfmmax", 0.0) @@ -252,7 +252,9 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): ) monkeypatch.setattr(pfv, "c_pf_cs_coil_pulse_start_ma", np.full(22, 0.0)) monkeypatch.setattr(pfv, "c_pf_cs_coil_flat_top_ma", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "curpfs", np.full(22, -175.84911993600002)) + monkeypatch.setattr( + pfv, "c_pf_cs_coil_pulse_end_ma", np.full(22, -175.84911993600002) + ) monkeypatch.setattr(pv, "rmajor", 8.938) monkeypatch.setattr(pv, "plasma_current", 1.8254e7) @@ -2484,7 +2486,7 @@ def test_peakb(monkeypatch: pytest.MonkeyPatch, pfcoil: PFCoil): ) monkeypatch.setattr( pfv, - "curpfs", + "c_pf_cs_coil_pulse_end_ma", np.array([ 0.067422231232391661, -2.9167273287450968, diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index b67d65fc12..e0da0a1f1b 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1887,7 +1887,7 @@ i_pf_superconductor = 9 *i_pf_current = * DESCRIPTION: Switch for controlling the current of the PF coils: (default = 1) -* =0 Input via the variables c_pf_cs_coil_pulse_start_ma, c_pf_cs_coil_flat_top_ma, curpfs +* =0 Input via the variables c_pf_cs_coil_pulse_start_ma, c_pf_cs_coil_flat_top_ma, c_pf_cs_coil_pulse_end_ma * =1 SVD targets zero field across midplane (flux swing * coils) and the correct vertical field at the plasma * center (equilibrium coils) diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index 6aecd05094..9f68f7a1e9 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1123,7 +1123,7 @@ def test_waveform(monkeypatch, pfcoil): ) monkeypatch.setattr( pfv, - "curpfs", + "c_pf_cs_coil_pulse_end_ma", np.array([ 14.742063826112622, 20.032681634901664, diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index b2ce76fb7d..92d2819e8a 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -209,7 +209,7 @@ class PfpwrParam(NamedTuple): cptdin: Any = None - curpfs: Any = None + c_pf_cs_coil_pulse_end_ma: Any = None ind_pf_cs_plasma_mutual: Any = None @@ -497,7 +497,7 @@ class PfpwrParam(NamedTuple): ), order="F", ).transpose(), - curpfs=np.array( + c_pf_cs_coil_pulse_end_ma=np.array( np.array( ( 0.067422231232391661, @@ -1240,7 +1240,7 @@ class PfpwrParam(NamedTuple): ), order="F", ).transpose(), - curpfs=np.array( + c_pf_cs_coil_pulse_end_ma=np.array( np.array( ( 0.019288882290113718, @@ -1822,7 +1822,11 @@ def test_pfpwr(pfpwrparam, monkeypatch, power): monkeypatch.setattr(pfcoil_variables, "cptdin", pfpwrparam.cptdin) - monkeypatch.setattr(pfcoil_variables, "curpfs", pfpwrparam.curpfs) + monkeypatch.setattr( + pfcoil_variables, + "c_pf_cs_coil_pulse_end_ma", + pfpwrparam.c_pf_cs_coil_pulse_end_ma, + ) monkeypatch.setattr( pfcoil_variables, "ind_pf_cs_plasma_mutual", pfpwrparam.ind_pf_cs_plasma_mutual From ac240e9f660dcb633b788ac99e7abab429ec571e Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 16:26:52 +0000 Subject: [PATCH 37/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'bpf'=20to=20'b?= =?UTF-8?q?=5Fpf=5Fcoil=5Fpeak'=20across=20multiple=20files=20for=20consis?= =?UTF-8?q?tency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 14 +- examples/data/large_tokamak_1_MFILE.DAT | 14 +- examples/data/large_tokamak_2_MFILE.DAT | 14 +- examples/data/large_tokamak_3_MFILE.DAT | 14 +- examples/data/large_tokamak_4_MFILE.DAT | 14 +- examples/data/scan_MFILE.DAT | 126 +++++------ process/pfcoil.py | 28 +-- source/fortran/pfcoil_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 14 +- .../data/large_tokamak_2_MFILE.DAT | 14 +- .../data/large_tokamak_3_MFILE.DAT | 14 +- .../data/large_tokamak_4_MFILE.DAT | 14 +- .../integration/data/large_tokamak_MFILE.DAT | 14 +- tests/integration/data/scan_2D_MFILE.DAT | 210 +++++++++--------- tests/integration/data/scan_MFILE.DAT | 126 +++++------ tests/integration/ref_dicts.json | 6 +- tests/integration/test_pfcoil_int.py | 8 +- tests/unit/data/large_tokamak_MFILE.DAT | 14 +- 18 files changed, 331 insertions(+), 331 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 374ceedebc..ec0b2bb8df 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -827,49 +827,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2994E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6436E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8574E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6228E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.6228E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0543E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3991E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3991E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.3830E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1532E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1259E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 7.1259E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6706E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1273E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1273E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9061E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6244E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6246E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6246E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6706E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1273E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1273E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9061E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6244E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6246E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6246E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5180E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0922E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0922E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3097E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2388E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5758E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5758E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5180E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0922E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0922E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3097E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2388E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5758E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5758E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3365E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5551E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.4232E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.7693E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.3997E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.3997E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8915E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 92faab9666..76add48584 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -822,49 +822,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6308E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8523E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4050E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 18a967f01c..82f8926aca 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -822,49 +822,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6308E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8523E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4050E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index f04b085518..0fb4d77f3b 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -822,49 +822,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6308E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8523E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4050E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 9ee74247d8..e904f29a61 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -822,49 +822,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6308E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8523E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4050E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 4e21becf16..df25086b80 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -658,49 +658,49 @@ PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 - PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 + PF_coil_01_field_(T)____________________________________________________ (b_pf_coil_peak(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 - PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 + PF_coil_02_field_(T)____________________________________________________ (b_pf_coil_peak(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 - PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 + PF_coil_03_field_(T)____________________________________________________ (b_pf_coil_peak(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 - PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 + PF_coil_04_field_(T)____________________________________________________ (b_pf_coil_peak(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 - PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 + PF_coil_05_field_(T)____________________________________________________ (b_pf_coil_peak(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 - PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 + PF_coil_06_field_(T)____________________________________________________ (b_pf_coil_peak(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -1653,49 +1653,49 @@ PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 - PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 + PF_coil_01_field_(T)____________________________________________________ (b_pf_coil_peak(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 - PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 + PF_coil_02_field_(T)____________________________________________________ (b_pf_coil_peak(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 - PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 + PF_coil_03_field_(T)____________________________________________________ (b_pf_coil_peak(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 - PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 + PF_coil_04_field_(T)____________________________________________________ (b_pf_coil_peak(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 - PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 + PF_coil_05_field_(T)____________________________________________________ (b_pf_coil_peak(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 - PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 + PF_coil_06_field_(T)____________________________________________________ (b_pf_coil_peak(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -2648,49 +2648,49 @@ PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 - PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 + PF_coil_01_field_(T)____________________________________________________ (b_pf_coil_peak(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 - PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 + PF_coil_02_field_(T)____________________________________________________ (b_pf_coil_peak(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 - PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 + PF_coil_03_field_(T)____________________________________________________ (b_pf_coil_peak(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 - PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 + PF_coil_04_field_(T)____________________________________________________ (b_pf_coil_peak(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 - PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 + PF_coil_05_field_(T)____________________________________________________ (b_pf_coil_peak(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 - PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 + PF_coil_06_field_(T)____________________________________________________ (b_pf_coil_peak(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -3643,49 +3643,49 @@ PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 - PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 + PF_coil_01_field_(T)____________________________________________________ (b_pf_coil_peak(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 - PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 + PF_coil_02_field_(T)____________________________________________________ (b_pf_coil_peak(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 - PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 + PF_coil_03_field_(T)____________________________________________________ (b_pf_coil_peak(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 - PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 + PF_coil_04_field_(T)____________________________________________________ (b_pf_coil_peak(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 - PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 + PF_coil_05_field_(T)____________________________________________________ (b_pf_coil_peak(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 - PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 + PF_coil_06_field_(T)____________________________________________________ (b_pf_coil_peak(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -4638,49 +4638,49 @@ PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 - PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 + PF_coil_01_field_(T)____________________________________________________ (b_pf_coil_peak(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 - PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 + PF_coil_02_field_(T)____________________________________________________ (b_pf_coil_peak(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 - PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 + PF_coil_03_field_(T)____________________________________________________ (b_pf_coil_peak(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 - PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 + PF_coil_04_field_(T)____________________________________________________ (b_pf_coil_peak(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 - PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 + PF_coil_05_field_(T)____________________________________________________ (b_pf_coil_peak(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 - PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 + PF_coil_06_field_(T)____________________________________________________ (b_pf_coil_peak(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -5633,49 +5633,49 @@ PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 - PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 + PF_coil_01_field_(T)____________________________________________________ (b_pf_coil_peak(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 - PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 + PF_coil_02_field_(T)____________________________________________________ (b_pf_coil_peak(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 - PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 + PF_coil_03_field_(T)____________________________________________________ (b_pf_coil_peak(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 - PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 + PF_coil_04_field_(T)____________________________________________________ (b_pf_coil_peak(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 - PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 + PF_coil_05_field_(T)____________________________________________________ (b_pf_coil_peak(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 - PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 + PF_coil_06_field_(T)____________________________________________________ (b_pf_coil_peak(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -6628,49 +6628,49 @@ PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 - PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 + PF_coil_01_field_(T)____________________________________________________ (b_pf_coil_peak(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 - PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 + PF_coil_02_field_(T)____________________________________________________ (b_pf_coil_peak(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 - PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 + PF_coil_03_field_(T)____________________________________________________ (b_pf_coil_peak(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 - PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 + PF_coil_04_field_(T)____________________________________________________ (b_pf_coil_peak(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 - PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 + PF_coil_05_field_(T)____________________________________________________ (b_pf_coil_peak(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 - PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 + PF_coil_06_field_(T)____________________________________________________ (b_pf_coil_peak(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -7623,49 +7623,49 @@ PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 - PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 + PF_coil_01_field_(T)____________________________________________________ (b_pf_coil_peak(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 - PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 + PF_coil_02_field_(T)____________________________________________________ (b_pf_coil_peak(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 - PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 + PF_coil_03_field_(T)____________________________________________________ (b_pf_coil_peak(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 - PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 + PF_coil_04_field_(T)____________________________________________________ (b_pf_coil_peak(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 - PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 + PF_coil_05_field_(T)____________________________________________________ (b_pf_coil_peak(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 - PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 + PF_coil_06_field_(T)____________________________________________________ (b_pf_coil_peak(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -8618,49 +8618,49 @@ PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 - PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 + PF_coil_01_field_(T)____________________________________________________ (b_pf_coil_peak(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 - PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 + PF_coil_02_field_(T)____________________________________________________ (b_pf_coil_peak(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 - PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 + PF_coil_03_field_(T)____________________________________________________ (b_pf_coil_peak(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 - PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 + PF_coil_04_field_(T)____________________________________________________ (b_pf_coil_peak(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 - PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 + PF_coil_05_field_(T)____________________________________________________ (b_pf_coil_peak(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 - PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 + PF_coil_06_field_(T)____________________________________________________ (b_pf_coil_peak(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/process/pfcoil.py b/process/pfcoil.py index bb2c72a105..3f10ed9adb 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -629,12 +629,12 @@ def pfcoil(self): # Index args +1ed bri, bro, bzi, bzo = self.peakb( i + 1, iii + 1, it - ) # returns bpf, bpf2 + ) # returns b_pf_coil_peak, bpf2 # Issue 1871. MDK # Allowable current density (for superconducting coils) for each coil, index i if pfv.i_pf_conductor == 0: - bmax = max(abs(pfv.bpf[i]), abs(pf.bpf2[i])) + bmax = max(abs(pfv.b_pf_coil_peak[i]), abs(pf.bpf2[i])) pfv.j_pf_wp_critical[i], jstrand, jsc, tmarg = self.superconpf( bmax, @@ -706,7 +706,7 @@ def pfcoil(self): forcepf = ( 0.5e6 - * (pfv.bpf[i] + pf.bpf2[i]) + * (pfv.b_pf_coil_peak[i] + pf.bpf2[i]) * abs(pfv.c_pf_cs_coils_peak_ma[i]) * pfv.r_pf_coil_middle[i] ) @@ -1147,7 +1147,7 @@ def ohcalc(self): pfv.bmaxoh0 = abs(pfv.bmaxoh0 + bzi) # Maximum field values - pfv.bpf[pfv.n_cs_pf_coils - 1] = max(pfv.bmaxoh, abs(pfv.bmaxoh0)) + pfv.b_pf_coil_peak[pfv.n_cs_pf_coils - 1] = max(pfv.bmaxoh, abs(pfv.bmaxoh0)) pf.bpf2[pfv.n_cs_pf_coils - 1] = max(bohco, abs(bzo)) # Stress ==> cross-sectional area of supporting steel to use @@ -1454,14 +1454,14 @@ def peakb(self, i, ii, it): pfv.z_pf_coil_middle[i - 1], ) - # bpf and bpf2 for the Central Solenoid are calculated in OHCALC + # b_pf_coil_peak and bpf2 for the Central Solenoid are calculated in OHCALC if (bv.iohcl != 0) and (i == pfv.n_cs_pf_coils): return bri, bro, bzi, bzo bpfin = math.sqrt(bri**2 + bzi**2) bpfout = math.sqrt(bro**2 + bzo**2) for n in range(pfv.n_pf_coils_in_group[ii - 1]): - pfv.bpf[i - 1 + n] = bpfin + pfv.b_pf_coil_peak[i - 1 + n] = bpfin pf.bpf2[i - 1 + n] = bpfout return bri, bro, bzi, bzo @@ -2520,8 +2520,8 @@ def outpf(self): op.ovarre( self.mfile, f"PF coil {k} field (T)", - f"(bpf[{k}])", - pfv.bpf[k], + f"(b_pf_coil_peak[{k}])", + pfv.b_pf_coil_peak[k], ) self.tf_pf_collision_detector() @@ -2576,8 +2576,8 @@ def outpf(self): op.ovarre( self.mfile, "Central solenoid field (T)", - "(bpf[n_cs_pf_coils-1])", - pfv.bpf[pfv.n_cs_pf_coils - 1], + "(b_pf_coil_peak[n_cs_pf_coils-1])", + pfv.b_pf_coil_peak[pfv.n_cs_pf_coils - 1], ) # Plasma @@ -2604,12 +2604,12 @@ def outpf(self): if pfv.i_pf_conductor == 0: op.write( self.outfile, - f"PF {k}\t{pfv.c_pf_cs_coils_peak_ma[k]:.2e}\t{pfv.j_pf_wp_critical[k]:.2e}\t{pfv.rjconpf[k]:.2e}\t{pfv.rjconpf[k] / pfv.j_pf_wp_critical[k]:.2e}\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.m_pf_coil_structure[k]:.2e}\t{pfv.bpf[k]:.2e}", + f"PF {k}\t{pfv.c_pf_cs_coils_peak_ma[k]:.2e}\t{pfv.j_pf_wp_critical[k]:.2e}\t{pfv.rjconpf[k]:.2e}\t{pfv.rjconpf[k] / pfv.j_pf_wp_critical[k]:.2e}\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.m_pf_coil_structure[k]:.2e}\t{pfv.b_pf_coil_peak[k]:.2e}", ) else: op.write( self.outfile, - f"PF {k}\t{pfv.c_pf_cs_coils_peak_ma[k]:.2e}\t-1.0e0\t{pfv.rjconpf[k]:.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.m_pf_coil_structure[k]:.2e}\t{pfv.bpf[k]:.2e}\t", + f"PF {k}\t{pfv.c_pf_cs_coils_peak_ma[k]:.2e}\t-1.0e0\t{pfv.rjconpf[k]:.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.m_pf_coil_structure[k]:.2e}\t{pfv.b_pf_coil_peak[k]:.2e}\t", ) # Central Solenoid, if present @@ -2618,12 +2618,12 @@ def outpf(self): # Issue #328 op.write( self.outfile, - f"CS\t\t{pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.j_pf_wp_critical[pfv.n_cs_pf_coils - 1]:.2e}\t{max(abs(pfv.j_cs_pulse_start), abs(pfv.j_cs_flat_top_end)):.2e}\t{max(abs(pfv.j_cs_pulse_start), abs(pfv.j_cs_flat_top_end)) / pfv.j_pf_wp_critical[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.bpf[pfv.n_cs_pf_coils - 1]:.2e}", + f"CS\t\t{pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.j_pf_wp_critical[pfv.n_cs_pf_coils - 1]:.2e}\t{max(abs(pfv.j_cs_pulse_start), abs(pfv.j_cs_flat_top_end)):.2e}\t{max(abs(pfv.j_cs_pulse_start), abs(pfv.j_cs_flat_top_end)) / pfv.j_pf_wp_critical[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.b_pf_coil_peak[pfv.n_cs_pf_coils - 1]:.2e}", ) else: op.write( self.outfile, - f"CS\t\t{pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1]:.2e}\t-1.0e0\t{max(abs(pfv.j_cs_pulse_start)):.2e}\t{abs(pfv.j_cs_flat_top_end):.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.bpf[pfv.n_cs_pf_coils - 1]:.2e}", + f"CS\t\t{pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1]:.2e}\t-1.0e0\t{max(abs(pfv.j_cs_pulse_start)):.2e}\t{abs(pfv.j_cs_flat_top_end):.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.m_pf_coil_structure[pfv.n_cs_pf_coils - 1]:.2e}\t{pfv.b_pf_coil_peak[pfv.n_cs_pf_coils - 1]:.2e}", ) # Miscellaneous totals diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 056a0a1c9a..91037be2d4 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -60,7 +60,7 @@ module pfcoil_variables real(dp) :: bmaxoh0 !! maximum field in central solenoid at beginning of pulse (T) - real(dp), dimension(ngc2) :: bpf + real(dp), dimension(ngc2) :: b_pf_coil_peak !! peak field at coil i (T) real(dp), dimension(n_pf_groups_max) :: ccl0_ma @@ -422,7 +422,7 @@ subroutine init_pfcoil_variables awpoh = 0.0D0 bmaxoh = 0.0D0 bmaxoh0 = 0.0D0 - bpf = 0.0D0 + b_pf_coil_peak = 0.0D0 ccl0_ma = (/0.0D0, 0.0D0, 0.0D0, & 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0/) ccls_ma = (/0.0D0, 0.0D0, 0.0D0, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index e53b14ff4e..a02da5c9e6 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -821,49 +821,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6308E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8523E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4050E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 9296ad449f..82bc15ddc4 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -822,49 +822,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6308E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8523E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4050E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 19733031aa..bde9ed79dd 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -822,49 +822,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6308E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8523E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4050E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 1dd3e5a90c..ef3b9e6765 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -822,49 +822,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2727E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4541E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7816E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.2280E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.2280E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0594E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3651E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3651E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.1248E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0499E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6990E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 6.6990E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6731E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1332E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1332E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9262E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.7049E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6389E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6389E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6731E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1332E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1332E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9262E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.7049E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6389E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6389E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5209E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0773E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0773E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3049E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2194E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5737E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5737E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5209E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0773E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0773E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3049E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2194E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5737E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5737E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2734E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7587E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6308E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8523E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4050E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.4050E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index cce15074d9..d7ec76d6c3 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -825,49 +825,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2662E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4091E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7637E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.1628E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.1628E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0608E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3575E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3575E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.0673E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0269E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6276E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 6.6276E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6738E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1326E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1326E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9242E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6968E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6370E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6370E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6738E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1326E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1326E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9242E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6968E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6370E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6370E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5216E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0591E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0591E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.2990E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.1960E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5683E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5683E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5216E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0591E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0591E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.2990E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.1960E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5683E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5683E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2588E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7696E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6221E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8489E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4055E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.4055E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.4358E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index fd5401a132..b72349c6a1 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -823,49 +823,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2937E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6029E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8411E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.5784E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.5784E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0553E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3925E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3925E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.3326E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1330E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.0768E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 7.0768E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6710E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1276E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1276E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9072E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6289E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6218E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6218E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6710E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1276E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1276E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9072E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6289E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6218E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6218E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5185E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0862E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0862E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3077E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2309E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5692E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5692E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5185E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0862E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0862E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3077E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2309E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5692E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5692E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3263E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5540E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6787E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8715E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4070E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.4070E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8645E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -1986,49 +1986,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3022E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6633E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8653E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6865E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.6865E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0536E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4030E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4030E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.4133E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1653E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1946E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 7.1946E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6702E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1278E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1278E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9080E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6320E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6226E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6226E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6702E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1278E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1278E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9080E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6320E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6226E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6226E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5176E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1075E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1075E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3146E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2585E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5753E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5753E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5176E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1075E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1075E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3146E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2585E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5753E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5753E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3448E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5277E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6691E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8677E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4035E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.4035E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9674E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -3149,49 +3149,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3092E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.7137E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8855E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7779E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.7779E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0523E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4117E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4117E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.4806E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1923E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2939E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 7.2939E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6695E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1277E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1277E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9075E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6299E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6223E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6223E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6695E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1277E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1277E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9075E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6299E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6223E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6223E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5168E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1222E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1222E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3194E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2776E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5793E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5793E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5168E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1222E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1222E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3194E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2776E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5793E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5793E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3583E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5352E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6652E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8661E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4029E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.4029E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0546E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -4312,49 +4312,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3091E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.7129E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8852E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7987E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.7987E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0524E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4119E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4119E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.4823E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1929E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.3157E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 7.3157E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6695E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1276E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1276E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9072E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6289E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6217E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6217E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6695E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1276E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1276E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9072E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6289E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6217E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6217E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5169E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1200E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1200E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3187E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2748E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5786E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5786E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5169E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1200E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1200E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3187E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2748E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5786E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5786E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3569E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5349E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6617E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8647E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4028E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.4028E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0446E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -5475,49 +5475,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3027E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6670E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8668E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7021E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.7021E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0536E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4038E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4038E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.4193E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1677E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2112E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 7.2112E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6702E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1287E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1287E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9110E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6438E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6247E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6247E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6702E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1287E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1287E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9110E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6438E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6247E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6247E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5176E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1138E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1138E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3167E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2667E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5777E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5777E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5176E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1138E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1138E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3167E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2667E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5777E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5777E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3448E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.5266E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6732E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8693E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4030E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.4030E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9622E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -6638,49 +6638,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2942E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6062E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8425E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.5872E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.5872E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0554E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3932E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3932E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.3377E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1351E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.0866E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 7.0866E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6710E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1288E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1288E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9112E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6450E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6249E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6249E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6710E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1288E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1288E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9112E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6450E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6249E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6249E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5185E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0957E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0957E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3108E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2432E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5729E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5729E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5185E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0957E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0957E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3108E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2432E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5729E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5729E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3304E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4639E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6670E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8668E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4019E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.4019E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8404E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -7801,49 +7801,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2941E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6053E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8421E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6058E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.6058E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0555E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3933E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3933E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.3389E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1356E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1061E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 7.1061E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6711E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1288E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1288E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9113E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6453E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6246E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6246E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6711E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1288E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1288E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9113E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6453E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6246E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6246E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5186E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0942E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0942E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3103E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2413E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5724E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5724E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5186E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0942E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0942E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3103E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2413E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5724E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5724E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3294E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4494E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6619E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8648E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4010E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.4010E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8266E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -8964,49 +8964,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3013E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6568E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8627E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7117E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.7117E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0541E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4025E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4025E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.4094E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1638E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2208E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 7.2208E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6704E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1281E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1281E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9089E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6357E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6226E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6226E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6704E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1281E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1281E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9089E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6357E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6226E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6226E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5178E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1059E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1059E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3141E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2565E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5749E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5749E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5178E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1059E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1059E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3141E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2565E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5749E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5749E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3439E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4622E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6621E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8648E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4004E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.4004E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9210E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -10127,49 +10127,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3076E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.7019E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8808E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.8179E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.8179E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0527E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4108E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4108E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.4731E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1892E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.3356E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 7.3356E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6696E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1265E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1265E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9035E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6140E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6179E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6179E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6696E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1265E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1265E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9035E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6140E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6179E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6179E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5170E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1109E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1109E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3157E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2629E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5747E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5747E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5170E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1109E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1109E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3157E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2629E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5747E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5747E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3578E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4724E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6615E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8646E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.3999E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.3999E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0077E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -11290,49 +11290,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3081E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.7053E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8821E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.8302E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.8302E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0527E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4114E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4114E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.4783E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1913E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.3487E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 7.3487E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6697E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1274E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1274E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9066E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6263E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6202E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6202E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6697E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1274E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1274E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9066E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6263E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6202E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6202E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5171E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1164E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1164E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3175E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2700E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5770E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5770E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5171E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1164E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1164E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3175E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2700E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5770E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5770E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3570E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4720E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6601E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8640E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.3998E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.3998E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0009E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -12453,49 +12453,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3023E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6640E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8656E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7247E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.7247E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0541E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4037E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4037E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.4184E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1674E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2346E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 7.2346E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6704E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1294E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1294E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9134E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6535E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6262E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6262E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6704E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1294E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1294E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9134E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6535E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6262E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6262E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5179E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1140E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1140E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3167E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2670E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5783E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5783E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5179E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1140E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1140E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3167E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2670E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5783E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5783E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3426E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4697E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6609E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8643E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4002E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.4002E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9208E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -13616,49 +13616,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2960E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6187E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8475E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6307E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.6307E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0556E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3956E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3956E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.3561E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1424E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1325E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 7.1325E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6712E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1302E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1302E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9159E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6635E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6284E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6284E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6712E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1302E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1302E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9159E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6635E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6284E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6284E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5187E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1029E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1029E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3131E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2525E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5762E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5762E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5187E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1029E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1029E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3131E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2525E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5762E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5762E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3286E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4537E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6527E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8611E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.3997E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.3997E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8389E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -14779,49 +14779,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2964E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6216E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8486E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.6451E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.6451E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0557E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3962E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3962E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.3608E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1443E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.1478E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 7.1478E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6712E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1309E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1309E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9184E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6735E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6303E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6303E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6712E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1309E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1309E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9184E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6735E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6303E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6303E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5187E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1069E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1069E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3145E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2578E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5780E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5780E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5187E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1069E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1069E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3145E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2578E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5780E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5780E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3276E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4535E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6506E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8602E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.3996E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.3996E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8318E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -15942,49 +15942,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3038E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.6745E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8698E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.7386E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.7386E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0542E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4053E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4053E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.4312E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.1725E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.2496E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 7.2496E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6704E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1310E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1310E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9188E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6753E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6307E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6307E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6704E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1310E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1310E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9188E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6753E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6307E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6307E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5179E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1247E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1247E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3202E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.2808E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5828E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5828E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5179E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1247E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1247E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3202E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.2808E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5828E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5828E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3422E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4673E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6556E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8622E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.3991E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.3991E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9246E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -17105,49 +17105,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.3112E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.7279E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.8912E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.8313E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.8313E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0527E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.4145E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.4145E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.5024E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.2010E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 7.3506E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 7.3506E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6697E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1312E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1312E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9193E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6773E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6312E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6312E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6697E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1312E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1312E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9193E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6773E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6312E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6312E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5170E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.1430E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.1430E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.3262E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.3046E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5879E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5879E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5170E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.1430E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.1430E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.3262E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.3046E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5879E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5879E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.3568E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.4798E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6592E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8637E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.3987E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.3987E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0197E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index aa51a9fdcd..742b1a996a 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -658,49 +658,49 @@ PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 - PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 + PF_coil_01_field_(T)____________________________________________________ (b_pf_coil_peak(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 - PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 + PF_coil_02_field_(T)____________________________________________________ (b_pf_coil_peak(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 - PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 + PF_coil_03_field_(T)____________________________________________________ (b_pf_coil_peak(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 - PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 + PF_coil_04_field_(T)____________________________________________________ (b_pf_coil_peak(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 - PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 + PF_coil_05_field_(T)____________________________________________________ (b_pf_coil_peak(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 - PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 + PF_coil_06_field_(T)____________________________________________________ (b_pf_coil_peak(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -1653,49 +1653,49 @@ PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 - PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 + PF_coil_01_field_(T)____________________________________________________ (b_pf_coil_peak(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 - PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 + PF_coil_02_field_(T)____________________________________________________ (b_pf_coil_peak(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 - PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 + PF_coil_03_field_(T)____________________________________________________ (b_pf_coil_peak(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 - PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 + PF_coil_04_field_(T)____________________________________________________ (b_pf_coil_peak(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 - PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 + PF_coil_05_field_(T)____________________________________________________ (b_pf_coil_peak(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 - PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 + PF_coil_06_field_(T)____________________________________________________ (b_pf_coil_peak(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -2648,49 +2648,49 @@ PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 - PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 + PF_coil_01_field_(T)____________________________________________________ (b_pf_coil_peak(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 - PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 + PF_coil_02_field_(T)____________________________________________________ (b_pf_coil_peak(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 - PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 + PF_coil_03_field_(T)____________________________________________________ (b_pf_coil_peak(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 - PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 + PF_coil_04_field_(T)____________________________________________________ (b_pf_coil_peak(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 - PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 + PF_coil_05_field_(T)____________________________________________________ (b_pf_coil_peak(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 - PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 + PF_coil_06_field_(T)____________________________________________________ (b_pf_coil_peak(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -3643,49 +3643,49 @@ PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 - PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 + PF_coil_01_field_(T)____________________________________________________ (b_pf_coil_peak(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 - PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 + PF_coil_02_field_(T)____________________________________________________ (b_pf_coil_peak(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 - PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 + PF_coil_03_field_(T)____________________________________________________ (b_pf_coil_peak(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 - PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 + PF_coil_04_field_(T)____________________________________________________ (b_pf_coil_peak(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 - PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 + PF_coil_05_field_(T)____________________________________________________ (b_pf_coil_peak(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 - PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 + PF_coil_06_field_(T)____________________________________________________ (b_pf_coil_peak(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -4638,49 +4638,49 @@ PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 - PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 + PF_coil_01_field_(T)____________________________________________________ (b_pf_coil_peak(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 - PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 + PF_coil_02_field_(T)____________________________________________________ (b_pf_coil_peak(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 - PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 + PF_coil_03_field_(T)____________________________________________________ (b_pf_coil_peak(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 - PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 + PF_coil_04_field_(T)____________________________________________________ (b_pf_coil_peak(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 - PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 + PF_coil_05_field_(T)____________________________________________________ (b_pf_coil_peak(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 - PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 + PF_coil_06_field_(T)____________________________________________________ (b_pf_coil_peak(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -5633,49 +5633,49 @@ PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 - PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 + PF_coil_01_field_(T)____________________________________________________ (b_pf_coil_peak(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 - PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 + PF_coil_02_field_(T)____________________________________________________ (b_pf_coil_peak(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 - PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 + PF_coil_03_field_(T)____________________________________________________ (b_pf_coil_peak(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 - PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 + PF_coil_04_field_(T)____________________________________________________ (b_pf_coil_peak(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 - PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 + PF_coil_05_field_(T)____________________________________________________ (b_pf_coil_peak(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 - PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 + PF_coil_06_field_(T)____________________________________________________ (b_pf_coil_peak(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -6628,49 +6628,49 @@ PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 - PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 + PF_coil_01_field_(T)____________________________________________________ (b_pf_coil_peak(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 - PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 + PF_coil_02_field_(T)____________________________________________________ (b_pf_coil_peak(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 - PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 + PF_coil_03_field_(T)____________________________________________________ (b_pf_coil_peak(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 - PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 + PF_coil_04_field_(T)____________________________________________________ (b_pf_coil_peak(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 - PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 + PF_coil_05_field_(T)____________________________________________________ (b_pf_coil_peak(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 - PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 + PF_coil_06_field_(T)____________________________________________________ (b_pf_coil_peak(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -7623,49 +7623,49 @@ PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 - PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 + PF_coil_01_field_(T)____________________________________________________ (b_pf_coil_peak(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 - PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 + PF_coil_02_field_(T)____________________________________________________ (b_pf_coil_peak(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 - PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 + PF_coil_03_field_(T)____________________________________________________ (b_pf_coil_peak(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 - PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 + PF_coil_04_field_(T)____________________________________________________ (b_pf_coil_peak(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 - PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 + PF_coil_05_field_(T)____________________________________________________ (b_pf_coil_peak(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 - PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 + PF_coil_06_field_(T)____________________________________________________ (b_pf_coil_peak(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # @@ -8618,49 +8618,49 @@ PF_coil_01_vertical_thickness_(m)_______________________________________ (pfdz01)______________________ 1.1966E+00 PF_coil_01_turns________________________________________________________ (n_pf_coil_turns(01))___________________ 3.7322E+02 PF_coil_01_current_(MA)_________________________________________________ (ric(01))_____________________ 1.5750E+01 - PF_coil_01_field_(T)____________________________________________________ (bpf(01))_____________________ 4.7287E+00 + PF_coil_01_field_(T)____________________________________________________ (b_pf_coil_peak(01))_____________________ 4.7287E+00 PF_coil_02_radius_(m)___________________________________________________ (r_pf_coil_middle(02))_____________________ 6.4763E+00 PF_coil_02_vertical_position_(m)________________________________________ (z_pf_coil_middle(02))_____________________ -1.1505E+01 PF_coil_02_radial_thickness_(m)_________________________________________ (pfdr02)______________________ 1.2848E+00 PF_coil_02_vertical_thickness_(m)_______________________________________ (pfdz02)______________________ -1.2848E+00 PF_coil_02_turns________________________________________________________ (n_pf_coil_turns(02))___________________ 4.3026E+02 PF_coil_02_current_(MA)_________________________________________________ (ric(02))_____________________ 1.8157E+01 - PF_coil_02_field_(T)____________________________________________________ (bpf(02))_____________________ 5.1781E+00 + PF_coil_02_field_(T)____________________________________________________ (b_pf_coil_peak(02))_____________________ 5.1781E+00 PF_coil_03_radius_(m)___________________________________________________ (r_pf_coil_middle(03))_____________________ 1.9032E+01 PF_coil_03_vertical_position_(m)________________________________________ (z_pf_coil_middle(03))_____________________ 2.9606E+00 PF_coil_03_radial_thickness_(m)_________________________________________ (pfdr03)______________________ 1.1659E+00 PF_coil_03_vertical_thickness_(m)_______________________________________ (pfdz03)______________________ 1.1659E+00 PF_coil_03_turns________________________________________________________ (n_pf_coil_turns(03))___________________ 1.9327E+02 PF_coil_03_current_(MA)_________________________________________________ (ric(03))_____________________ -8.1561E+00 - PF_coil_03_field_(T)____________________________________________________ (bpf(03))_____________________ 2.6808E+00 + PF_coil_03_field_(T)____________________________________________________ (b_pf_coil_peak(03))_____________________ 2.6808E+00 PF_coil_04_radius_(m)___________________________________________________ (r_pf_coil_middle(04))_____________________ 1.9032E+01 PF_coil_04_vertical_position_(m)________________________________________ (z_pf_coil_middle(04))_____________________ -2.9606E+00 PF_coil_04_radial_thickness_(m)_________________________________________ (pfdr04)______________________ 1.1659E+00 PF_coil_04_vertical_thickness_(m)_______________________________________ (pfdz04)______________________ -1.1659E+00 PF_coil_04_turns________________________________________________________ (n_pf_coil_turns(04))___________________ 1.9327E+02 PF_coil_04_current_(MA)_________________________________________________ (ric(04))_____________________ -8.1561E+00 - PF_coil_04_field_(T)____________________________________________________ (bpf(04))_____________________ 2.6808E+00 + PF_coil_04_field_(T)____________________________________________________ (b_pf_coil_peak(04))_____________________ 2.6808E+00 PF_coil_05_radius_(m)___________________________________________________ (r_pf_coil_middle(05))_____________________ 1.7386E+01 PF_coil_05_vertical_position_(m)________________________________________ (z_pf_coil_middle(05))_____________________ 8.2897E+00 PF_coil_05_radial_thickness_(m)_________________________________________ (pfdr05)______________________ 8.2067E-01 PF_coil_05_vertical_thickness_(m)_______________________________________ (pfdz05)______________________ 8.2067E-01 PF_coil_05_turns________________________________________________________ (n_pf_coil_turns(05))___________________ 1.2530E+02 PF_coil_05_current_(MA)_________________________________________________ (ric(05))_____________________ -5.3879E+00 - PF_coil_05_field_(T)____________________________________________________ (bpf(05))_____________________ 2.5876E+00 + PF_coil_05_field_(T)____________________________________________________ (b_pf_coil_peak(05))_____________________ 2.5876E+00 PF_coil_06_radius_(m)___________________________________________________ (r_pf_coil_middle(06))_____________________ 1.7386E+01 PF_coil_06_vertical_position_(m)________________________________________ (z_pf_coil_middle(06))_____________________ -8.2897E+00 PF_coil_06_radial_thickness_(m)_________________________________________ (pfdr06)______________________ 8.2067E-01 PF_coil_06_vertical_thickness_(m)_______________________________________ (pfdz06)______________________ -8.2067E-01 PF_coil_06_turns________________________________________________________ (n_pf_coil_turns(06))___________________ 1.2530E+02 PF_coil_06_current_(MA)_________________________________________________ (ric(06))_____________________ -5.3879E+00 - PF_coil_06_field_(T)____________________________________________________ (bpf(06))_____________________ 2.5876E+00 + PF_coil_06_field_(T)____________________________________________________ (b_pf_coil_peak(06))_____________________ 2.5876E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle(n_cs_pf_coils))___________________ 2.6164E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle(n_cs_pf_coils))___________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 7.0754E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.6640E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns(n_cs_pf_coils))_________________ 3.5015E+03 Central_solenoid_current_(MA)___________________________________________ (ric(n_cs_pf_coils))___________________ -1.5057E+02 - Central_solenoid_field_(T)______________________________________________ (bpf(n_cs_pf_coils))___________________ 1.1499E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak(n_cs_pf_coils))___________________ 1.1499E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index e614389059..c7a639deff 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1129,7 +1129,7 @@ "bp": 0.0, "bp_ratio_ib": 0.0, "bp_ratio_ob": 0.0, - "bpf": 0.0, + "b_pf_coil_peak": 0.0, "bpf2": [ 0.0, 0.0, @@ -8939,7 +8939,7 @@ "bp": "poloidal field (T)", "bp_ratio_ib": "", "bp_ratio_ob": "", - "bpf": "peak field at coil i (T)", + "b_pf_coil_peak": "peak field at coil i (T)", "bpf2": "", "bpsout": "reference B_p at outboard divertor strike point (T)", "breeder": "Breeder type (allowed values are Orthosilicate, Metatitanate or Zirconate)", @@ -18932,7 +18932,7 @@ "awpoh", "bmaxoh", "bmaxoh0", - "bpf", + "b_pf_coil_peak", "ccl0_ma", "ccls_ma", "j_cs_pulse_start", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index fc30e75acc..f23be4a3bb 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -83,7 +83,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "fcohbof", 2.654e-1) monkeypatch.setattr(pfv, "rpf2", -1.825) monkeypatch.setattr(pfv, "nfxfh", 7) - monkeypatch.setattr(pfv, "bpf", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "b_pf_coil_peak", np.full(22, 0.0)) monkeypatch.setattr(pfv, "z_pf_coil_lower", np.full(22, 0.0)) monkeypatch.setattr(pfv, "m_pf_coil_conductor", np.full(22, 0.0)) monkeypatch.setattr(pfv, "vf", np.full(22, 3.0e-1)) @@ -217,7 +217,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "rho_pf_coil", 2.8e-8) monkeypatch.setattr(pfv, "vf", np.full(22, 0.3)) monkeypatch.setattr(pfv, "c_pf_cs_coils_peak_ma", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "bpf", np.full(22, 0.0)) + monkeypatch.setattr(pfv, "b_pf_coil_peak", np.full(22, 0.0)) monkeypatch.setattr(pfv, "jscoh_eof", 4.758e8) monkeypatch.setattr(pfv, "z_pf_coil_middle", np.full(22, 0.0)) monkeypatch.setattr(pfv, "r_pf_coil_outer", np.full(22, 0.0)) @@ -270,7 +270,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): pfcoil.ohcalc() - assert pytest.approx(pfv.bpf[4]) == 13.073958753751993 + assert pytest.approx(pfv.b_pf_coil_peak[4]) == 13.073958753751993 assert pytest.approx(pfv.rjohc) == 54101481.7685945 @@ -2368,7 +2368,7 @@ def test_peakb(monkeypatch: pytest.MonkeyPatch, pfcoil: PFCoil): ) monkeypatch.setattr(pfv, "j_cs_flat_top_end", 20726000) monkeypatch.setattr(pfv, "n_pf_coil_groups", 4) - monkeypatch.setattr(pfv, "bpf", np.zeros(22, dtype=int)) # maybe + monkeypatch.setattr(pfv, "b_pf_coil_peak", np.zeros(22, dtype=int)) # maybe monkeypatch.setattr( pfv, "z_pf_coil_middle", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index fbd8c6dbaf..c748e4183b 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -825,49 +825,49 @@ PF_coil_0_vertical_thickness_(m)________________________________________ (pfdz(0))_____________________ 1.2662E+00 PF_coil_0_turns_________________________________________________________ (n_pf_coil_turns[0])____________________ 4.4091E+02 PF_coil_0_current_(MA)__________________________________________________ (ric[0])______________________ 1.7637E+01 - PF_coil_0_field_(T)_____________________________________________________ (bpf[0])______________________ 6.1628E+00 + PF_coil_0_field_(T)_____________________________________________________ (b_pf_coil_peak[0])______________________ 6.1628E+00 PF_coil_1_radius_(m)____________________________________________________ (r_pf_coil_middle[1]_______________________ 5.5667E+00 PF_coil_1_vertical_position_(m)_________________________________________ (z_pf_coil_middle[1])______________________ -1.0608E+01 PF_coil_1_radial_thickness_(m)__________________________________________ (pfdr(1))_____________________ 1.3575E+00 PF_coil_1_vertical_thickness_(m)________________________________________ (pfdz(1))_____________________ -1.3575E+00 PF_coil_1_turns_________________________________________________________ (n_pf_coil_turns[1])____________________ 5.0673E+02 PF_coil_1_current_(MA)__________________________________________________ (ric[1])______________________ 2.0269E+01 - PF_coil_1_field_(T)_____________________________________________________ (bpf[1])______________________ 6.6276E+00 + PF_coil_1_field_(T)_____________________________________________________ (b_pf_coil_peak[1])______________________ 6.6276E+00 PF_coil_2_radius_(m)____________________________________________________ (r_pf_coil_middle[2]_______________________ 1.6738E+01 PF_coil_2_vertical_position_(m)_________________________________________ (z_pf_coil_middle[2])______________________ 2.6667E+00 PF_coil_2_radial_thickness_(m)__________________________________________ (pfdr(2))_____________________ 1.1326E+00 PF_coil_2_vertical_thickness_(m)________________________________________ (pfdz(2))_____________________ 1.1326E+00 PF_coil_2_turns_________________________________________________________ (n_pf_coil_turns[2])____________________ 1.9242E+02 PF_coil_2_current_(MA)__________________________________________________ (ric[2])______________________ -7.6968E+00 - PF_coil_2_field_(T)_____________________________________________________ (bpf[2])______________________ 2.6370E+00 + PF_coil_2_field_(T)_____________________________________________________ (b_pf_coil_peak[2])______________________ 2.6370E+00 PF_coil_3_radius_(m)____________________________________________________ (r_pf_coil_middle[3]_______________________ 1.6738E+01 PF_coil_3_vertical_position_(m)_________________________________________ (z_pf_coil_middle[3])______________________ -2.6667E+00 PF_coil_3_radial_thickness_(m)__________________________________________ (pfdr(3))_____________________ 1.1326E+00 PF_coil_3_vertical_thickness_(m)________________________________________ (pfdz(3))_____________________ -1.1326E+00 PF_coil_3_turns_________________________________________________________ (n_pf_coil_turns[3])____________________ 1.9242E+02 PF_coil_3_current_(MA)__________________________________________________ (ric[3])______________________ -7.6968E+00 - PF_coil_3_field_(T)_____________________________________________________ (bpf[3])______________________ 2.6370E+00 + PF_coil_3_field_(T)_____________________________________________________ (b_pf_coil_peak[3])______________________ 2.6370E+00 PF_coil_4_radius_(m)____________________________________________________ (r_pf_coil_middle[4]_______________________ 1.5216E+01 PF_coil_4_vertical_position_(m)_________________________________________ (z_pf_coil_middle[4])______________________ 7.4667E+00 PF_coil_4_radial_thickness_(m)__________________________________________ (pfdr(4))_____________________ 8.0591E-01 PF_coil_4_vertical_thickness_(m)________________________________________ (pfdz(4))_____________________ 8.0591E-01 PF_coil_4_turns_________________________________________________________ (n_pf_coil_turns[4])____________________ 1.2990E+02 PF_coil_4_current_(MA)__________________________________________________ (ric[4])______________________ -5.1960E+00 - PF_coil_4_field_(T)_____________________________________________________ (bpf[4])______________________ 2.5683E+00 + PF_coil_4_field_(T)_____________________________________________________ (b_pf_coil_peak[4])______________________ 2.5683E+00 PF_coil_5_radius_(m)____________________________________________________ (r_pf_coil_middle[5]_______________________ 1.5216E+01 PF_coil_5_vertical_position_(m)_________________________________________ (z_pf_coil_middle[5])______________________ -7.4667E+00 PF_coil_5_radial_thickness_(m)__________________________________________ (pfdr(5))_____________________ 8.0591E-01 PF_coil_5_vertical_thickness_(m)________________________________________ (pfdz(5))_____________________ -8.0591E-01 PF_coil_5_turns_________________________________________________________ (n_pf_coil_turns[5])____________________ 1.2990E+02 PF_coil_5_current_(MA)__________________________________________________ (ric[5])______________________ -5.1960E+00 - PF_coil_5_field_(T)_____________________________________________________ (bpf[5])______________________ 2.5683E+00 + PF_coil_5_field_(T)_____________________________________________________ (b_pf_coil_peak[5])______________________ 2.5683E+00 Central_solenoid_radius_(m)_____________________________________________ (r_pf_coil_middle[n_cs_pf_coils-1])_________________ 2.2588E+00 Central_solenoid_vertical_position_(m)__________________________________ (z_pf_coil_middle[n_cs_pf_coils-1])_________________ 0.0000E+00 Central_solenoid_radial_thickness_(m)___________________________________ (ohdr)________________________ 5.7696E-01 Central_solenoid_vertical_thickness_(m)_________________________________ (ohdz)________________________ 1.5873E+01 Central_solenoid_turns__________________________________________________ (n_pf_coil_turns[n_cs_pf_coils-1])_______________ 4.6221E+03 Central_solenoid_current_(MA)___________________________________________ (ric[n_cs_pf_coils-1])_________________ -1.8489E+02 - Central_solenoid_field_(T)______________________________________________ (bpf[n_cs_pf_coils-1])_________________ 1.4055E+01 + Central_solenoid_field_(T)______________________________________________ (b_pf_coil_peak[n_cs_pf_coils-1])_________________ 1.4055E+01 Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.4358E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # From f499e528b70ced3fb7683787f53a88a4750c5ab4 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 16:29:37 +0000 Subject: [PATCH 38/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'bmaxoh0'=20to=20?= =?UTF-8?q?'b=5Fcs=5Fpeak=5Fpulse=5Fstart'=20across=20multiple=20files=20f?= =?UTF-8?q?or=20consistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/pfcoil.py | 18 ++++++----- source/fortran/constraint_equations.f90 | 12 ++++---- source/fortran/pfcoil_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/integration/test_pfcoil_int.py | 2 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_pfcoil.py | 2 +- 21 files changed, 68 insertions(+), 66 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index ec0b2bb8df..655ca3ba58 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -774,7 +774,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.3084E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3997E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3997E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5395E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0618E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.4704E+07 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 76add48584..50f992e954 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -769,7 +769,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1737E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4050E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 82f8926aca..b66d8d980d 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -769,7 +769,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1737E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4050E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 0fb4d77f3b..eb23fff20a 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -769,7 +769,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1737E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4050E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index e904f29a61..4877e19dca 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -769,7 +769,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1737E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4050E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index df25086b80..e6f97e619a 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -617,7 +617,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP @@ -1612,7 +1612,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP @@ -2607,7 +2607,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP @@ -3602,7 +3602,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP @@ -4597,7 +4597,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP @@ -5592,7 +5592,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP @@ -6587,7 +6587,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP @@ -7582,7 +7582,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP @@ -8577,7 +8577,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP diff --git a/process/pfcoil.py b/process/pfcoil.py index 3f10ed9adb..c1964e3172 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1134,8 +1134,8 @@ def ohcalc(self): bohco = abs(bzo) # Peak field at the Beginning-Of-Pulse (BOP) - # Occurs at inner edge of coil; bmaxoh0 and bzi are of same sign at BOP - pfv.bmaxoh0 = self.bfmax( + # Occurs at inner edge of coil; b_cs_peak_pulse_start and bzi are of same sign at BOP + pfv.b_cs_peak_pulse_start = self.bfmax( pfv.j_cs_pulse_start, pfv.r_pf_coil_inner[pfv.n_cs_pf_coils - 1], pfv.r_pf_coil_outer[pfv.n_cs_pf_coils - 1], @@ -1144,10 +1144,12 @@ def ohcalc(self): timepoint = 2 bri, bro, bzi, bzo = self.peakb(pfv.n_cs_pf_coils, 99, timepoint) - pfv.bmaxoh0 = abs(pfv.bmaxoh0 + bzi) + pfv.b_cs_peak_pulse_start = abs(pfv.b_cs_peak_pulse_start + bzi) # Maximum field values - pfv.b_pf_coil_peak[pfv.n_cs_pf_coils - 1] = max(pfv.bmaxoh, abs(pfv.bmaxoh0)) + pfv.b_pf_coil_peak[pfv.n_cs_pf_coils - 1] = max( + pfv.bmaxoh, abs(pfv.b_cs_peak_pulse_start) + ) pf.bpf2[pfv.n_cs_pf_coils - 1] = max(bohco, abs(bzo)) # Stress ==> cross-sectional area of supporting steel to use @@ -1271,7 +1273,7 @@ def ohcalc(self): # Allowable coil overall current density at BOP jcritwp, pfv.jcableoh_bop, pfv.jscoh_bop, tmarg2 = self.superconpf( - pfv.bmaxoh0, + pfv.b_cs_peak_pulse_start, pfv.vfohc, pfv.fcuohsu, (abs(pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1]) / pfv.awpoh) @@ -1627,7 +1629,7 @@ def hoop_stress(self, r): epsilon = r / a # Field at inner radius of coil [T] - b_a = pfv.bmaxoh0 + b_a = pfv.b_cs_peak_pulse_start # Field at outer radius of coil [T] # Assume to be 0 for now @@ -2039,8 +2041,8 @@ def outpf(self): op.ovarre( self.outfile, "Maximum field at Beginning Of Pulse (T)", - "(bmaxoh0)", - pfv.bmaxoh0, + "(b_cs_peak_pulse_start)", + pfv.b_cs_peak_pulse_start, "OP ", ) op.ovarre( diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 0072719418..6458acd313 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2987,15 +2987,15 @@ subroutine constraint_eqn_079(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! args : output structure : residual error; constraint value; residual error in physical units; output string; units string !! Equation for maximum CS field !! #=# pfcoil - !! #=#=# fbmaxcs, bmaxoh, bmaxoh0, b_cs_limit_max + !! #=#=# fbmaxcs, bmaxoh, b_cs_peak_pulse_start, b_cs_limit_max !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! fbmaxcs : input : F-value for CS mmax field (cons. 79, itvar 149) !! b_cs_limit_max : input : Central solenoid max field limit [T] - !! bmaxoh0 : input : maximum field in central solenoid at beginning of pulse (T) + !! b_cs_peak_pulse_start : input : maximum field in central solenoid at beginning of pulse (T) !! bmaxoh : input real : maximum field in central solenoid at end of flat-top (EoF) (T) - !! (Note: original code has "bmaxoh/bmaxoh0 | peak CS field [T]".) - use pfcoil_variables, only: fbmaxcs, b_cs_limit_max, bmaxoh0, bmaxoh + !! (Note: original code has "bmaxoh/b_cs_peak_pulse_start | peak CS field [T]".) + use pfcoil_variables, only: fbmaxcs, b_cs_limit_max, b_cs_peak_pulse_start, bmaxoh implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -3003,9 +3003,9 @@ subroutine constraint_eqn_079(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 - fbmaxcs * b_cs_limit_max/max(bmaxoh, bmaxoh0) + tmp_cc = 1.0D0 - fbmaxcs * b_cs_limit_max/max(bmaxoh, b_cs_peak_pulse_start) tmp_con = b_cs_limit_max - tmp_err = max(bmaxoh, bmaxoh0) * tmp_cc + tmp_err = max(bmaxoh, b_cs_peak_pulse_start) * tmp_cc tmp_symbol = '<' tmp_units = 'A/turn' diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 91037be2d4..7a6bb8d970 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -57,7 +57,7 @@ module pfcoil_variables real(dp) :: bmaxoh !! maximum field in central solenoid at end of flat-top (EoF) (T) - real(dp) :: bmaxoh0 + real(dp) :: b_cs_peak_pulse_start !! maximum field in central solenoid at beginning of pulse (T) real(dp), dimension(ngc2) :: b_pf_coil_peak @@ -421,7 +421,7 @@ subroutine init_pfcoil_variables a_oh_turn = 0.0D0 awpoh = 0.0D0 bmaxoh = 0.0D0 - bmaxoh0 = 0.0D0 + b_cs_peak_pulse_start = 0.0D0 b_pf_coil_peak = 0.0D0 ccl0_ma = (/0.0D0, 0.0D0, 0.0D0, & 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0, 0.0D0/) diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index a02da5c9e6..de0ca56730 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -768,7 +768,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1737E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4050E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 82bc15ddc4..d624f28d15 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -769,7 +769,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1737E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4050E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index bde9ed79dd..bff81532d1 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -769,7 +769,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1737E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4050E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index ef3b9e6765..7a25cd0f7c 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -769,7 +769,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1737E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4050E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index d7ec76d6c3..b22adf7154 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -772,7 +772,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1458E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4055E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4055E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4872E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0462E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5137E+07 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index b72349c6a1..90c16351c3 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -770,7 +770,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2414E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4070E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4070E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4743E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0423E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.6946E+07 OP @@ -1933,7 +1933,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2925E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4035E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4035E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5050E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0515E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7013E+07 OP @@ -3096,7 +3096,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.3450E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4029E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4029E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5107E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0532E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.6963E+07 OP @@ -4259,7 +4259,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.3452E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4028E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4028E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5119E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0536E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.6955E+07 OP @@ -5422,7 +5422,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2904E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4026E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4026E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5139E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0542E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7157E+07 OP @@ -6585,7 +6585,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2344E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3979E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3979E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5564E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0669E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7694E+07 OP @@ -7748,7 +7748,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2345E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3965E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3965E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5690E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0707E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7792E+07 OP @@ -8911,7 +8911,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2870E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3964E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3964E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5698E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0709E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7701E+07 OP @@ -10074,7 +10074,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.3353E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3954E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3954E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5786E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0736E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7684E+07 OP @@ -11237,7 +11237,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.3353E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3952E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3952E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5809E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0743E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7698E+07 OP @@ -12400,7 +12400,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2788E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3979E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3979E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5563E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0669E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7541E+07 OP @@ -13563,7 +13563,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2215E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3997E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3997E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5397E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0619E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7385E+07 OP @@ -14726,7 +14726,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2217E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3996E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3996E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5406E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0622E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7380E+07 OP @@ -15889,7 +15889,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.2711E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3991E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3991E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5452E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0636E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7355E+07 OP @@ -17052,7 +17052,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.3194E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.3986E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3986E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5494E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0648E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7312E+07 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 742b1a996a..2a76ff999a 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -617,7 +617,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP @@ -1612,7 +1612,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP @@ -2607,7 +2607,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP @@ -3602,7 +3602,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP @@ -4597,7 +4597,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP @@ -5592,7 +5592,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP @@ -6587,7 +6587,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP @@ -7582,7 +7582,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP @@ -8577,7 +8577,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 6.4527E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.1499E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index c7a639deff..d5c90a9ee0 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -409,7 +409,7 @@ "blwidto": 0.0, "b_cs_limit_max": 13.0, "bmaxoh": 0.0, - "bmaxoh0": 0.0, + "b_cs_peak_pulse_start": 0.0, "bmaxtf": 0.0, "bmaxtfrp": 0.0, "bmn": 0.001, @@ -8923,7 +8923,7 @@ "blwidto": "Inboard/outboard blanket mid-plan toroidal circumference for segment (m)", "b_cs_limit_max": "Central solenoid max field limit [T]", "bmaxoh": "maximum field in central solenoid at end of flat-top (EoF) (T)", - "bmaxoh0": "maximum field in central solenoid at beginning of pulse (T)", + "b_cs_peak_pulse_start": "maximum field in central solenoid at beginning of pulse (T)", "bmaxtf": "mean peak field at TF coil (T)", "bmaxtfrp": "peak field at TF conductor with ripple (T)", "bmn": "relative radial field perturbation", @@ -18931,7 +18931,7 @@ "a_oh_turn", "awpoh", "bmaxoh", - "bmaxoh0", + "b_cs_peak_pulse_start", "b_pf_coil_peak", "ccl0_ma", "ccls_ma", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index f23be4a3bb..a901039f3a 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -209,7 +209,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "s_tresca_oh", 5.718e8) monkeypatch.setattr(pfv, "awpoh", 4.232) monkeypatch.setattr(pfv, "oh_steel_frac", 5.926e-1) - monkeypatch.setattr(pfv, "bmaxoh0", 1.4e1) + monkeypatch.setattr(pfv, "b_cs_peak_pulse_start", 1.4e1) monkeypatch.setattr(pfv, "rjohc", 4.070e7) monkeypatch.setattr(pfv, "temp_cs_margin", 1.5) monkeypatch.setattr(pfv, "i_pf_conductor", 0) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index e0da0a1f1b..0b0007c563 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1733,7 +1733,7 @@ i_pf_conductor = 0 *icc = 79 * DESCRIPTION: Constraint equation for maximum CS field * JUSTIFICATION: Turned off, dont care about maximum CS field -* VARIABLES: b_cs_limit_max (Central solenoid max field limit [T]). bmaxoh0,bmaxoh calculated in-situ +* VARIABLES: b_cs_limit_max (Central solenoid max field limit [T]). b_cs_peak_pulse_start,bmaxoh calculated in-situ *b_cs_limit_max = * DESCRIPTION: Maximum allowed peak field on central solenoid (icc = 79) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index c748e4183b..717841890b 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -772,7 +772,7 @@ Actual_current_/_critical_current_______________________________________ (iooic)_______________________ 7.1458E-01 OP # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 - Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (bmaxoh0)_____________________ 1.4055E+01 OP + Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4055E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4872E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0462E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5137E+07 OP diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index 9f68f7a1e9..76fff5c5d1 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1977,7 +1977,7 @@ def test_hoop_stress(pfcoil, monkeypatch): :type monkeypatch: _pytest.monkeypatch.MonkeyPatch """ monkeypatch.setattr(pfv, "oh_steel_frac", 0.57874999999999999) - monkeypatch.setattr(pfv, "bmaxoh0", 13.522197474024983) + monkeypatch.setattr(pfv, "b_cs_peak_pulse_start", 13.522197474024983) monkeypatch.setattr(pfv, "j_cs_pulse_start", 19311657.760000002) monkeypatch.setattr(pfv, "n_cs_pf_coils", 7) monkeypatch.setattr( From 8bbf26f2596fb4f6bf8529c9e6a2b9207ede681d Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 16:31:40 +0000 Subject: [PATCH 39/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'bmaxoh'=20to=20'?= =?UTF-8?q?b=5Fcs=5Fpeak=5Fflat=5Ftop=5Fend'=20across=20multiple=20files?= =?UTF-8?q?=20for=20consistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/pfcoil.py | 10 +++---- source/fortran/constraint_equations.f90 | 12 ++++---- source/fortran/pfcoil_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/integration/test_pfcoil_int.py | 2 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- 20 files changed, 62 insertions(+), 62 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 655ca3ba58..8d2f390c8c 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -779,7 +779,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0618E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.4704E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9770E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3221E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3221E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 4.2900E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.2870E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 4.2063E+07 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 50f992e954..7c716bf78f 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -774,7 +774,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3920E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index b66d8d980d..7d34787d16 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -774,7 +774,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3920E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index eb23fff20a..e0133e2dfe 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -774,7 +774,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3920E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 4877e19dca..7915457b9e 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -774,7 +774,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3920E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index e6f97e619a..83e25e51d6 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -622,7 +622,7 @@ Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP @@ -1617,7 +1617,7 @@ Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP @@ -2612,7 +2612,7 @@ Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP @@ -3607,7 +3607,7 @@ Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP @@ -4602,7 +4602,7 @@ Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP @@ -5597,7 +5597,7 @@ Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP @@ -6592,7 +6592,7 @@ Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP @@ -7587,7 +7587,7 @@ Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP @@ -8582,7 +8582,7 @@ Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP diff --git a/process/pfcoil.py b/process/pfcoil.py index c1964e3172..60880e49fb 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1127,7 +1127,7 @@ def ohcalc(self): timepoint = 5 bri, bro, bzi, bzo = self.peakb(pfv.n_cs_pf_coils, 99, timepoint) - pfv.bmaxoh = abs(bzi - bmaxoh2) + pfv.b_cs_peak_flat_top_end = abs(bzi - bmaxoh2) # Peak field on outboard side of central Solenoid # (self-field is assumed to be zero - long solenoid approximation) @@ -1148,7 +1148,7 @@ def ohcalc(self): # Maximum field values pfv.b_pf_coil_peak[pfv.n_cs_pf_coils - 1] = max( - pfv.bmaxoh, abs(pfv.b_cs_peak_pulse_start) + pfv.b_cs_peak_flat_top_end, abs(pfv.b_cs_peak_pulse_start) ) pf.bpf2[pfv.n_cs_pf_coils - 1] = max(bohco, abs(bzo)) @@ -1249,7 +1249,7 @@ def ohcalc(self): # (superconducting coils only) jcritwp, pfv.jcableoh_eof, pfv.jscoh_eof, tmarg1 = self.superconpf( - pfv.bmaxoh, + pfv.b_cs_peak_flat_top_end, pfv.vfohc, pfv.fcuohsu, (abs(pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1]) / pfv.awpoh) @@ -2077,8 +2077,8 @@ def outpf(self): op.ovarre( self.outfile, "Maximum field at End Of Flattop (T)", - "(bmaxoh)", - pfv.bmaxoh, + "(b_cs_peak_flat_top_end)", + pfv.b_cs_peak_flat_top_end, "OP ", ) op.ovarre( diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 6458acd313..3001afbea3 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2987,15 +2987,15 @@ subroutine constraint_eqn_079(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! args : output structure : residual error; constraint value; residual error in physical units; output string; units string !! Equation for maximum CS field !! #=# pfcoil - !! #=#=# fbmaxcs, bmaxoh, b_cs_peak_pulse_start, b_cs_limit_max + !! #=#=# fbmaxcs, b_cs_peak_flat_top_end, b_cs_peak_pulse_start, b_cs_limit_max !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! fbmaxcs : input : F-value for CS mmax field (cons. 79, itvar 149) !! b_cs_limit_max : input : Central solenoid max field limit [T] !! b_cs_peak_pulse_start : input : maximum field in central solenoid at beginning of pulse (T) - !! bmaxoh : input real : maximum field in central solenoid at end of flat-top (EoF) (T) - !! (Note: original code has "bmaxoh/b_cs_peak_pulse_start | peak CS field [T]".) - use pfcoil_variables, only: fbmaxcs, b_cs_limit_max, b_cs_peak_pulse_start, bmaxoh + !! b_cs_peak_flat_top_end : input real : maximum field in central solenoid at end of flat-top (EoF) (T) + !! (Note: original code has "b_cs_peak_flat_top_end/b_cs_peak_pulse_start | peak CS field [T]".) + use pfcoil_variables, only: fbmaxcs, b_cs_limit_max, b_cs_peak_pulse_start, b_cs_peak_flat_top_end implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -3003,9 +3003,9 @@ subroutine constraint_eqn_079(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 - fbmaxcs * b_cs_limit_max/max(bmaxoh, b_cs_peak_pulse_start) + tmp_cc = 1.0D0 - fbmaxcs * b_cs_limit_max/max(b_cs_peak_flat_top_end, b_cs_peak_pulse_start) tmp_con = b_cs_limit_max - tmp_err = max(bmaxoh, b_cs_peak_pulse_start) * tmp_cc + tmp_err = max(b_cs_peak_flat_top_end, b_cs_peak_pulse_start) * tmp_cc tmp_symbol = '<' tmp_units = 'A/turn' diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 7a6bb8d970..09338f39c2 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -54,7 +54,7 @@ module pfcoil_variables real(dp) :: awpoh !! central solenoid conductor+void area with area of steel subtracted (m2) - real(dp) :: bmaxoh + real(dp) :: b_cs_peak_flat_top_end !! maximum field in central solenoid at end of flat-top (EoF) (T) real(dp) :: b_cs_peak_pulse_start @@ -420,7 +420,7 @@ subroutine init_pfcoil_variables a_cs_poloidal = 0.0D0 a_oh_turn = 0.0D0 awpoh = 0.0D0 - bmaxoh = 0.0D0 + b_cs_peak_flat_top_end = 0.0D0 b_cs_peak_pulse_start = 0.0D0 b_pf_coil_peak = 0.0D0 ccl0_ma = (/0.0D0, 0.0D0, 0.0D0, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index de0ca56730..5e7a061728 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -773,7 +773,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3920E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index d624f28d15..7b275a475b 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -774,7 +774,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3920E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index bff81532d1..946727bdf6 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -774,7 +774,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3920E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 7a25cd0f7c..4438254a46 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -774,7 +774,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3920E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index b22adf7154..0e6c4cf006 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -777,7 +777,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0462E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5137E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9094E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3907E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3907E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6220E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0866E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6495E+07 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 90c16351c3..8b44196c70 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -775,7 +775,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0423E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.6946E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9874E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.4055E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4055E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.4875E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0463E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7086E+07 OP @@ -1938,7 +1938,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0515E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7013E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9925E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.4012E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4012E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5259E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0578E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7235E+07 OP @@ -3101,7 +3101,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0532E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.6963E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9893E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3990E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3990E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5459E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0638E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7334E+07 OP @@ -4264,7 +4264,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0536E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.6955E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9892E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3987E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3987E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5486E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0646E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7341E+07 OP @@ -5427,7 +5427,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0542E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7157E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9915E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.4030E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4030E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5102E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0531E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7118E+07 OP @@ -6590,7 +6590,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0669E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7694E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0074E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.4019E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4019E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5201E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0560E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7309E+07 OP @@ -7753,7 +7753,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0707E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7792E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0108E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.4010E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4010E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5281E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0584E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7359E+07 OP @@ -8916,7 +8916,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0709E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7701E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0063E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.4004E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4004E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5337E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0601E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7320E+07 OP @@ -10079,7 +10079,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0736E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7684E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0015E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3999E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3999E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5380E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0614E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7257E+07 OP @@ -11242,7 +11242,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0743E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7698E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0013E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3998E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3998E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5386E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0616E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7254E+07 OP @@ -12405,7 +12405,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0669E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7541E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0056E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.4002E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4002E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5351E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0605E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7316E+07 OP @@ -13568,7 +13568,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0619E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7385E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0138E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3982E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3982E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5531E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0659E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7526E+07 OP @@ -14731,7 +14731,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0622E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7380E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0137E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3980E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3980E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5550E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0665E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7533E+07 OP @@ -15894,7 +15894,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0636E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7355E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0082E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3986E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3986E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5498E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0649E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7403E+07 OP @@ -17057,7 +17057,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0648E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7312E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0034E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3987E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3987E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5491E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0647E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7308E+07 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 2a76ff999a..b95e2a66a4 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -622,7 +622,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP @@ -1617,7 +1617,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP @@ -2612,7 +2612,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP @@ -3607,7 +3607,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP @@ -4602,7 +4602,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP @@ -5597,7 +5597,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP @@ -6592,7 +6592,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP @@ -7587,7 +7587,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP @@ -8582,7 +8582,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.0525E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index d5c90a9ee0..8f6d10b40a 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -408,7 +408,7 @@ "blwidti": 0.0, "blwidto": 0.0, "b_cs_limit_max": 13.0, - "bmaxoh": 0.0, + "b_cs_peak_flat_top_end": 0.0, "b_cs_peak_pulse_start": 0.0, "bmaxtf": 0.0, "bmaxtfrp": 0.0, @@ -8922,7 +8922,7 @@ "blwidti": "Inboard/outboard blanket mid-plan toroidal circumference for segment (m)", "blwidto": "Inboard/outboard blanket mid-plan toroidal circumference for segment (m)", "b_cs_limit_max": "Central solenoid max field limit [T]", - "bmaxoh": "maximum field in central solenoid at end of flat-top (EoF) (T)", + "b_cs_peak_flat_top_end": "maximum field in central solenoid at end of flat-top (EoF) (T)", "b_cs_peak_pulse_start": "maximum field in central solenoid at beginning of pulse (T)", "bmaxtf": "mean peak field at TF coil (T)", "bmaxtfrp": "peak field at TF conductor with ripple (T)", @@ -18930,7 +18930,7 @@ "a_cs_poloidal", "a_oh_turn", "awpoh", - "bmaxoh", + "b_cs_peak_flat_top_end", "b_cs_peak_pulse_start", "b_pf_coil_peak", "ccl0_ma", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index a901039f3a..070e2ea975 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -192,7 +192,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(fwbsv, "denstl", 7.8e3) monkeypatch.setattr(eh, "idiags", np.full(8, 0)) monkeypatch.setattr(pfv, "n_cs_pf_coils", 5) - monkeypatch.setattr(pfv, "bmaxoh", 1.4e1) + monkeypatch.setattr(pfv, "b_cs_peak_flat_top_end", 1.4e1) monkeypatch.setattr(pfv, "i_cs_stress", 0) monkeypatch.setattr(pfv, "j_cs_flat_top_end", 1.693e7) monkeypatch.setattr(pfv, "r_cs_middle", 3.0) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 0b0007c563..96f05c5be5 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1733,7 +1733,7 @@ i_pf_conductor = 0 *icc = 79 * DESCRIPTION: Constraint equation for maximum CS field * JUSTIFICATION: Turned off, dont care about maximum CS field -* VARIABLES: b_cs_limit_max (Central solenoid max field limit [T]). b_cs_peak_pulse_start,bmaxoh calculated in-situ +* VARIABLES: b_cs_limit_max (Central solenoid max field limit [T]). b_cs_peak_pulse_start,b_cs_peak_flat_top_end calculated in-situ *b_cs_limit_max = * DESCRIPTION: Maximum allowed peak field on central solenoid (icc = 79) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 717841890b..c5fafb5dcf 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -777,7 +777,7 @@ Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0462E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5137E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9094E+07 OP - Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (bmaxoh)______________________ 1.3907E+01 OP + Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3907E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6220E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0866E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6495E+07 OP From e5c6a9d08297e28324a7d17677a4dfd508b382e5 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 11 Feb 2025 16:33:00 +0000 Subject: [PATCH 40/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'a=5Foh=5Fturn'?= =?UTF-8?q?=20to=20'a=5Fcs=5Fturn'=20across=20multiple=20files=20for=20con?= =?UTF-8?q?sistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/central-solenoid.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- process/io/variable_metadata.py | 2 +- process/pfcoil.py | 10 +++---- process/sctfcoil.py | 6 ++-- source/fortran/pfcoil_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/ref_dicts.json | 6 ++-- tests/integration/test_pfcoil_int.py | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- 19 files changed, 42 insertions(+), 42 deletions(-) diff --git a/documentation/proc-pages/eng-models/central-solenoid.md b/documentation/proc-pages/eng-models/central-solenoid.md index 10010fb78d..b31a0746fa 100644 --- a/documentation/proc-pages/eng-models/central-solenoid.md +++ b/documentation/proc-pages/eng-models/central-solenoid.md @@ -96,7 +96,7 @@ An example output follows. Note that in this example the cycle life is *not* su Minimum burn time (s) (t_burn_min) 7.200E+03 Initial vertical crack size (m) (t_crack_vertical) 8.900E-04 Initial radial crack size (m) (t_crack_radial) 2.670E-03 - CS turn area (m) (a_oh_turn) 1.904E-03 + CS turn area (m) (a_cs_turn) 1.904E-03 CS turn length (m) (l_cond_cst) 7.557E-02 CS turn internal cable space radius (m) (r_in_cst) 6.732E-03 CS turn width (m) (d_cond_cst) 2.519E-02 diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 8d2f390c8c..35c3648378 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -809,7 +809,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.9935E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9935E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.7333E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.3195E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5778E-02 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 7c716bf78f..75dd210331 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -804,7 +804,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.9739E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9739E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.6953E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4740E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5651E-02 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 7d34787d16..23d3d4aeaf 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -804,7 +804,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.9739E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9739E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.6953E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4740E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5651E-02 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index e0133e2dfe..6c3406239a 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -804,7 +804,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.9739E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9739E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.6953E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4740E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5651E-02 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 7915457b9e..f191b01873 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -804,7 +804,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.9739E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9739E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.6953E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4740E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5651E-02 diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index c33c613cfe..ac46e2195b 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -289,7 +289,7 @@ class VariableMetadata: description="Minimum cycles for stress", units="", ), - "a_oh_turn": VariableMetadata( + "a_cs_turn": VariableMetadata( latex=r"$Turn_{\mathrm{area}}^{\mathrm{CS}}[$m$^{2}]$", description="Cross-sectional area of CS coil turns", units="m^2", diff --git a/process/pfcoil.py b/process/pfcoil.py index 60880e49fb..a519ce86ca 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1081,10 +1081,10 @@ def ohcalc(self): ) # Turn vertical cross-sectionnal area - pfv.a_oh_turn = pfv.a_cs_poloidal / pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1] + pfv.a_cs_turn = pfv.a_cs_poloidal / pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1] # Depth/width of cs turn conduit - pfv.d_cond_cst = (pfv.a_oh_turn / pfv.ld_ratio_cst) ** 0.5 + pfv.d_cond_cst = (pfv.a_cs_turn / pfv.ld_ratio_cst) ** 0.5 # length of cs turn conduit pfv.l_cond_cst = pfv.ld_ratio_cst * pfv.d_cond_cst # Radius of turn space = pfv.r_in_cst @@ -1094,7 +1094,7 @@ def ohcalc(self): p2_cst = ( (pfv.l_cond_cst * pfv.d_cond_cst) - (4 - constants.pi) * (pfv.r_out_cst**2) - - (pfv.a_oh_turn * pfv.oh_steel_frac) + - (pfv.a_cs_turn * pfv.oh_steel_frac) ) / constants.pi # CS coil turn geometry calculation - stadium shape # Literature: https://doi.org/10.1016/j.fusengdes.2017.04.052 @@ -2289,8 +2289,8 @@ def outpf(self): op.ovarre( self.outfile, "CS turn area (m)", - "(a_oh_turn)", - pfv.a_oh_turn, + "(a_cs_turn)", + pfv.a_cs_turn, ) op.ovarre( self.outfile, diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 2b9a2069e3..e6419c3894 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -3793,12 +3793,12 @@ def stresscl( n_oh_turns = 1.0e6 * curr_oh_max / cptdin[sum(n_pf_coils_in_group)] # CS Turn vertical cross-sectionnal area - a_oh_turn = a_oh / n_oh_turns + a_cs_turn = a_oh / n_oh_turns # CS coil turn geometry calculation - stadium shape # Literature: https://doi.org/10.1016/j.fusengdes.2017.04.052 d_cond_cst = ( - a_oh_turn / ld_ratio_cst + a_cs_turn / ld_ratio_cst ) ** 0.5 # width of cs turn conduit l_cond_cst = ld_ratio_cst * d_cond_cst # length of cs turn conduit # Radius of turn space = r_in_cst @@ -3808,7 +3808,7 @@ def stresscl( p2 = ( (l_cond_cst * d_cond_cst) - (4 - np.pi) * (r_out_cst**2) - - (a_oh_turn * oh_steel_frac) + - (a_cs_turn * oh_steel_frac) ) / np.pi r_in_cst = -((l_cond_cst - d_cond_cst) / np.pi) + np.sqrt(p1 + p2) t_cond_oh = ( diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 09338f39c2..5b828d18ac 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -48,7 +48,7 @@ module pfcoil_variables real(dp) :: a_cs_poloidal !! Central solenoid vertical cross-sectional area (m2) - real(dp) :: a_oh_turn + real(dp) :: a_cs_turn !! Central solenoid (OH) trun cross-sectional area (m2) real(dp) :: awpoh @@ -418,7 +418,7 @@ subroutine init_pfcoil_variables alstroh = 4.0D8 i_cs_stress = 0 a_cs_poloidal = 0.0D0 - a_oh_turn = 0.0D0 + a_cs_turn = 0.0D0 awpoh = 0.0D0 b_cs_peak_flat_top_end = 0.0D0 b_cs_peak_pulse_start = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 5e7a061728..8b9505c0d3 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -803,7 +803,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.9739E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9739E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.6953E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4740E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5651E-02 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 7b275a475b..f91ebb0d2f 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -804,7 +804,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.9739E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9739E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.6953E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4740E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5651E-02 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 946727bdf6..07787cecf7 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -804,7 +804,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.9739E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9739E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.6953E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4740E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5651E-02 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 4438254a46..8917744667 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -804,7 +804,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.9739E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9739E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.6953E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4740E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5651E-02 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 0e6c4cf006..6c791f7d6e 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -807,7 +807,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.9813E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9813E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.7097E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4684E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5699E-02 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 8b44196c70..0c8fd3ff31 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -805,7 +805,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.8842E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8842E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.5184E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.6208E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5061E-02 @@ -1968,7 +1968,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.8791E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8791E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.5083E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5657E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5028E-02 @@ -3131,7 +3131,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.8833E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8833E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.5166E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5551E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5055E-02 @@ -4294,7 +4294,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.8846E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8846E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.5192E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5540E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5064E-02 @@ -5457,7 +5457,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.8772E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8772E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.5043E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5701E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5014E-02 @@ -6620,7 +6620,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.8583E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8583E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4666E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5465E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4889E-02 @@ -7783,7 +7783,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.8554E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8554E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4607E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5344E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4869E-02 @@ -8946,7 +8946,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.8597E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8597E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4693E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5265E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4898E-02 @@ -10109,7 +10109,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.8634E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8634E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4767E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5155E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4922E-02 @@ -11272,7 +11272,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.8638E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8638E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4776E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5148E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4925E-02 @@ -12435,7 +12435,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.8627E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8627E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4754E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5297E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4918E-02 @@ -13598,7 +13598,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.8605E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8605E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4710E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5285E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4903E-02 @@ -14761,7 +14761,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.8613E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8613E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4725E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5277E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4908E-02 @@ -15924,7 +15924,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.8640E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8640E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4780E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5206E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4927E-02 @@ -17087,7 +17087,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.8669E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.8669E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.4837E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.5116E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.4946E-02 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 8f6d10b40a..f4fa8a9112 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -98,7 +98,7 @@ "a_leg_cond": 0.0, "a_leg_gr_ins": 0.0, "a_leg_ins": 0.0, - "a_oh_turn": 0.0, + "a_cs_turn": 0.0, "a_reactor_bldg": 8320.0, "a_reactor_service_bldg": 2440.0, "a_security_bldg": 4552.0, @@ -8766,7 +8766,7 @@ "a_leg_cond": "Exact TF ouboard leg conductor area [m2]", "a_leg_gr_ins": "TF outboard leg ground insulation area per coil [m2]", "a_leg_ins": "TF ouboard leg turn insulation area per coil [m2]", - "a_oh_turn": "Central solenoid (OH) trun cross-sectional area (m2)", + "a_cs_turn": "Central solenoid (OH) trun cross-sectional area (m2)", "a_reactor_bldg": "Floor area of reactor building in m^2", "a_reactor_service_bldg": "Floor area of reactor service building in m^2", "a_security_bldg": "Floor area of security building in m^2", @@ -18928,7 +18928,7 @@ "alstroh", "i_cs_stress", "a_cs_poloidal", - "a_oh_turn", + "a_cs_turn", "awpoh", "b_cs_peak_flat_top_end", "b_cs_peak_pulse_start", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 070e2ea975..cc35639c1c 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -232,7 +232,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "z_pf_coil_lower", np.full(22, 0.0)) monkeypatch.setattr(pfv, "n_pf_coil_turns", np.full(22, 0.0)) monkeypatch.setattr(pfv, "m_pf_coil_structure", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "a_oh_turn", 0.0) + monkeypatch.setattr(pfv, "a_cs_turn", 0.0) monkeypatch.setattr(tfv, "dcond", np.full(9, 9.0e3)) monkeypatch.setattr(tfv, "tftmp", 4.750) monkeypatch.setattr(tfv, "tcritsc", 1.6e1) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index c5fafb5dcf..871ce1b487 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -807,7 +807,7 @@ Minimum_burn_time_(s)___________________________________________________ (t_burn_min)______________________ 7.2000E+03 Initial_vertical_crack_size_(m)_________________________________________ (t_crack_vertical)____________ 8.9000E-04 Initial_radial_crack_size_(m)___________________________________________ (t_crack_radial)______________ 2.6700E-03 - CS_turn_area_(m)________________________________________________________ (a_oh_turn)___________________ 1.9813E-03 + CS_turn_area_(m)________________________________________________________ (a_cs_turn)___________________ 1.9813E-03 CS_turn_length_(m)______________________________________________________ (l_cond_cst)__________________ 7.7097E-02 CS_turn_internal_cable_space_radius_(m)_________________________________ (r_in_cst)____________________ 7.4684E-03 CS_turn_width_(m)_______________________________________________________ (d_cond_cst)__________________ 2.5699E-02 From bc3c4f7851a81f5275e7c6203d939c61e5ca2381 Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Tue, 11 Feb 2025 21:12:57 +0000 Subject: [PATCH 41/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'oh=5Fsteel=5Ffra?= =?UTF-8?q?c'=20to=20'f=5Fa=5Fcs=5Fsteel'=20across=20multiple=20files=20fo?= =?UTF-8?q?r=20consistency=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 6 ++-- examples/data/large_tokamak_1_MFILE.DAT | 6 ++-- examples/data/large_tokamak_2_MFILE.DAT | 6 ++-- examples/data/large_tokamak_3_MFILE.DAT | 6 ++-- examples/data/large_tokamak_4_MFILE.DAT | 6 ++-- examples/data/large_tokamak_IN.DAT | 4 +-- examples/data/scan_MFILE.DAT | 24 ++++++------- examples/data/scan_example_file_IN.DAT | 4 +-- large_tokamak.IN.DAT:Zone.Identifier | 0 process/io/plot_radial_build.py | 2 +- process/io/plot_scans.py | 2 +- process/io/variable_metadata.py | 2 +- process/pfcoil.py | 12 +++---- process/sctfcoil.py | 10 +++--- source/fortran/input.f90 | 6 ++-- source/fortran/iteration_variables.f90 | 12 +++---- source/fortran/numerics.f90 | 2 +- source/fortran/pfcoil_variables.f90 | 4 +-- source/fortran/scan.f90 | 2 +- st_regression.IN.DAT:Zone.Identifier | 0 .../data/large_tokamak_1_MFILE.DAT | 6 ++-- .../data/large_tokamak_2_MFILE.DAT | 6 ++-- .../data/large_tokamak_3_MFILE.DAT | 6 ++-- .../data/large_tokamak_4_MFILE.DAT | 6 ++-- tests/integration/data/large_tokamak_IN.DAT | 4 +-- .../integration/data/large_tokamak_MFILE.DAT | 6 ++-- .../data/large_tokamak_once_through.IN.DAT | 4 +-- tests/integration/data/ref_IN.DAT | 6 ++-- tests/integration/data/scan_2D_MFILE.DAT | 34 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 24 ++++++------- .../data/uncertainties_nonopt_ref_IN.DAT | 6 ++-- .../integration/data/uncertainties_ref_IN.DAT | 6 ++-- tests/integration/ref_dicts.json | 24 ++++++------- tests/integration/test_pfcoil_int.py | 4 +-- .../input_files/large_tokamak.IN.DAT | 4 +-- .../input_files/large_tokamak_nof.IN.DAT | 4 +-- .../large_tokamak_once_through.IN.DAT | 4 +-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_IN.DAT | 4 +-- tests/unit/data/large_tokamak_MFILE.DAT | 6 ++-- tests/unit/test_pfcoil.py | 2 +- tests/unit/test_sctfcoil.py | 8 ++--- 42 files changed, 146 insertions(+), 146 deletions(-) create mode 100644 large_tokamak.IN.DAT:Zone.Identifier create mode 100644 st_regression.IN.DAT:Zone.Identifier diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 35c3648378..b18ad1db1d 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -792,7 +792,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 2.8819E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.2351E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7006E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.3310E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.3310E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.8991E+08 OP @@ -1465,9 +1465,9 @@ cpttf = 65000.0 ixc = 109 boundu(109) = 0.1 -* CS steel fraction, oh_steel_frac +* CS steel fraction, f_a_cs_steel ixc = 122 -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 * core impurity fraction, Xenon ixc = 135 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 75dd210331..b090a4e6ac 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -787,7 +787,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.1868E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.7569E+08 OP @@ -1459,9 +1459,9 @@ cpttf = 65000.0 ixc = 109 boundu(109) = 0.1 -* CS steel fraction, oh_steel_frac +* CS steel fraction, f_a_cs_steel ixc = 122 -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 * core impurity fraction, Xenon ixc = 135 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 23d3d4aeaf..840f3cf7e1 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -787,7 +787,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.1868E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.7569E+08 OP @@ -1459,9 +1459,9 @@ cpttf = 65000.0 ixc = 109 boundu(109) = 0.1 -* CS steel fraction, oh_steel_frac +* CS steel fraction, f_a_cs_steel ixc = 122 -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 * core impurity fraction, Xenon ixc = 135 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 6c3406239a..8359979ca2 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -787,7 +787,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.1868E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.7569E+08 OP @@ -1459,9 +1459,9 @@ cpttf = 65000.0 ixc = 109 boundu(109) = 0.1 -* CS steel fraction, oh_steel_frac +* CS steel fraction, f_a_cs_steel ixc = 122 -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 * core impurity fraction, Xenon ixc = 135 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index f191b01873..c8b8ba8563 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -787,7 +787,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.1868E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.7569E+08 OP @@ -1459,9 +1459,9 @@ cpttf = 65000.0 ixc = 109 boundu(109) = 0.1 -* CS steel fraction, oh_steel_frac +* CS steel fraction, f_a_cs_steel ixc = 122 -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 * core impurity fraction, Xenon ixc = 135 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index aa89599874..11ebc9a65f 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -269,9 +269,9 @@ cpttf = 65000.0 ixc = 109 boundu(109) = 0.1 -* CS steel fraction, oh_steel_frac +* CS steel fraction, f_a_cs_steel ixc = 122 -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 * core impurity fraction, Xenon ixc = 135 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 83e25e51d6..1ca6197728 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -635,7 +635,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6000E+08 OP @@ -1630,7 +1630,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6000E+08 OP @@ -2625,7 +2625,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6000E+08 OP @@ -3620,7 +3620,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6000E+08 OP @@ -4615,7 +4615,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6000E+08 OP @@ -5610,7 +5610,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6000E+08 OP @@ -6605,7 +6605,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6000E+08 OP @@ -7600,7 +7600,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6000E+08 OP @@ -8595,7 +8595,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6000E+08 OP @@ -9066,7 +9066,7 @@ boundl(59) = 0.50 boundu(59) = 0.94 ixc = 54 * ftmargtf ixc = 106 * ftmargoh -ixc = 122 * oh_steel_frac +ixc = 122 * f_a_cs_steel ixc = 123 * foh_stress ixc = 109 * f_nd_alpha_electron ixc = 110 * falpha_energy_confinement @@ -9225,7 +9225,7 @@ zref(8) = 1.0 alstroh = 6.6D8 * allowable hoop stress in Central Solenoid structural material (Pa) fcuohsu = 0.70 * copper fraction of strand in central solenoid cable i_cs_superconductor = 5 * WST Nb3Sn parameterisation -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 *----------------Physics Variables-----------------* @@ -9349,7 +9349,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) fcutfsu = 8.0884E-01 ftmargtf = 1.0000E+00 ftmargoh = 1.0000E+00 - oh_steel_frac = 5.7875E-01 + f_a_cs_steel = 5.7875E-01 foh_stress = 1.0000E+00 f_nd_alpha_electron = 6.8940E-02 falpha_energy_confinement = 1.0000E+00 \ No newline at end of file diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index b760f10f23..7759fe78f5 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -269,9 +269,9 @@ cpttf = 65000.0 ixc = 109 boundu(109) = 0.1 -* CS steel fraction, oh_steel_frac +* CS steel fraction, f_a_cs_steel ixc = 122 -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 * core impurity fraction, Xenon ixc = 135 diff --git a/large_tokamak.IN.DAT:Zone.Identifier b/large_tokamak.IN.DAT:Zone.Identifier new file mode 100644 index 0000000000..e69de29bb2 diff --git a/process/io/plot_radial_build.py b/process/io/plot_radial_build.py index 83bcf4dea4..dc118e75d4 100644 --- a/process/io/plot_radial_build.py +++ b/process/io/plot_radial_build.py @@ -213,7 +213,7 @@ def main(args=None): "dr_cs", "f_z_cs_tf_internal", "csfv.n_cycle_min", - "pfv.oh_steel_frac", + "pfv.f_a_cs_steel", "csfv.t_crack_vertical", "", "", diff --git a/process/io/plot_scans.py b/process/io/plot_scans.py index b7d882d243..8a4cb2cd8e 100644 --- a/process/io/plot_scans.py +++ b/process/io/plot_scans.py @@ -261,7 +261,7 @@ def main(args=None): 63: "dr_cs", 64: "f_z_cs_tf_internal", 65: "csfv.n_cycle_min", - 66: "pfv.oh_steel_frac", + 66: "pfv.f_a_cs_steel", 67: "csfv.t_crack_vertical", 68: "inlet_temp_liq", 69: "outlet_temp_liq", diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index ac46e2195b..cbe0c197c7 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -299,7 +299,7 @@ class VariableMetadata: description="Minimum burn time", units="s", ), - "pfv.oh_steel_frac": VariableMetadata( + "pfv.f_a_cs_steel": VariableMetadata( latex=r"$f_{\mathrm{Steel}}^{\mathrm{CS}}$", description="Steel fraction in CS coil", units="", diff --git a/process/pfcoil.py b/process/pfcoil.py index a519ce86ca..b54b310b65 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1094,7 +1094,7 @@ def ohcalc(self): p2_cst = ( (pfv.l_cond_cst * pfv.d_cond_cst) - (4 - constants.pi) * (pfv.r_out_cst**2) - - (pfv.a_cs_turn * pfv.oh_steel_frac) + - (pfv.a_cs_turn * pfv.f_a_cs_steel) ) / constants.pi # CS coil turn geometry calculation - stadium shape # Literature: https://doi.org/10.1016/j.fusengdes.2017.04.052 @@ -1181,7 +1181,7 @@ def ohcalc(self): # equation is used for Central Solenoid stress # Area of steel in Central Solenoid - areaspf = pfv.oh_steel_frac * pfv.a_cs_poloidal + areaspf = pfv.f_a_cs_steel * pfv.a_cs_poloidal if pfv.i_cs_stress == 1: pfv.s_tresca_oh = max( @@ -1671,7 +1671,7 @@ def hoop_stress(self, r): s_hoop_nom = hp_term_1 * hp_term_2 - hp_term_3 * hp_term_4 - return s_hoop_nom / pfv.oh_steel_frac + return s_hoop_nom / pfv.f_a_cs_steel def axial_stress(self): """Calculation of axial stress of central solenoid. @@ -1726,7 +1726,7 @@ def axial_stress(self): ) # calculate unsmeared axial stress [MPa] - s_axial = axial_force / (pfv.oh_steel_frac * 0.5 * area_ax) + s_axial = axial_force / (pfv.f_a_cs_steel * 0.5 * area_ax) return s_axial, axial_force @@ -2156,8 +2156,8 @@ def outpf(self): op.ovarre( self.outfile, "CS steel area fraction", - "(oh_steel_frac)", - pfv.oh_steel_frac, + "(f_a_cs_steel)", + pfv.f_a_cs_steel, ) if pfv.i_cs_stress == 1: op.ocmmnt(self.outfile, "Hoop + axial stress considered") diff --git a/process/sctfcoil.py b/process/sctfcoil.py index e6419c3894..9467de0e0a 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1278,7 +1278,7 @@ def sctfcoil(self, output: bool): pfcoil_variables.n_pf_coils_in_group, pfcoil_variables.ld_ratio_cst, pfcoil_variables.r_out_cst, - pfcoil_variables.oh_steel_frac, + pfcoil_variables.f_a_cs_steel, tfcoil_variables.eyoung_steel, tfcoil_variables.poisson_steel, tfcoil_variables.eyoung_cond_axial, @@ -3593,7 +3593,7 @@ def stresscl( n_pf_coils_in_group, ld_ratio_cst, r_out_cst, - oh_steel_frac, + f_a_cs_steel, eyoung_steel, poisson_steel, eyoung_cond_axial, @@ -3808,7 +3808,7 @@ def stresscl( p2 = ( (l_cond_cst * d_cond_cst) - (4 - np.pi) * (r_out_cst**2) - - (a_cs_turn * oh_steel_frac) + - (a_cs_turn * f_a_cs_steel) ) / np.pi r_in_cst = -((l_cond_cst - d_cond_cst) / np.pi) + np.sqrt(p1 + p2) t_cond_oh = ( @@ -3833,10 +3833,10 @@ def stresscl( # Get transverse properties (eyoung_trans[0], a_working, poisson_trans[0]) = eyoung_parallel( eyoung_steel, - oh_steel_frac, + f_a_cs_steel, poisson_steel, eyoung_cond_axial, - 1e0 - oh_steel_frac, + 1e0 - f_a_cs_steel, poisson_cond_axial, ) diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 85b1c4f2d2..df7a5b1e4b 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -295,7 +295,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) coreradiationfraction, fimp use numerics, only: factor, boundl, minmax, neqns, nvar, epsfcn, ixc, & epsvmc, ftol, ipnvars, ioptimz, nineqns, ipeqns, boundu, icc, ipnfoms, name_xc - use pfcoil_variables, only: rhopfbus, rjconpf, zref, fcuohsu, oh_steel_frac, vf, & + use pfcoil_variables, only: rhopfbus, rjconpf, zref, fcuohsu, f_a_cs_steel, vf, & j_cs_flat_top_end, sigpfcalw, alstroh, i_pf_conductor, fcupfsu, fvssu, etapsu, i_cs_stress, & fbmaxcs, ngc, rpf2, fcohbop, f_z_cs_tf_internal, vfohc, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & n_pf_coil_groups, i_pf_superconductor, nfxfh, alfapf, routr, sigpfcf, rho_pf_coil, b_cs_limit_max, & @@ -1332,8 +1332,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('fseppc') call parse_real_variable('fseppc', fseppc, 1.0D6, 1.0D9, & 'CS separation force held by CS pre-comp structure') - case ('oh_steel_frac') - call parse_real_variable('oh_steel_frac', oh_steel_frac, 1.0D-3, 0.999D0, & + case ('f_a_cs_steel') + call parse_real_variable('f_a_cs_steel', f_a_cs_steel, 1.0D-3, 0.999D0, & 'Central solenoid steel fraction') case ('foh_stress') call parse_real_variable('foh_stress', foh_stress, 1.0D-3, 1.0D0, & diff --git a/source/fortran/iteration_variables.f90 b/source/fortran/iteration_variables.f90 index ba66a3af32..f800fbf53d 100755 --- a/source/fortran/iteration_variables.f90 +++ b/source/fortran/iteration_variables.f90 @@ -2673,25 +2673,25 @@ end subroutine set_itv_121 !--------------------------------- subroutine init_itv_122 - !!
        • (122) oh_steel_frac : streel fraction of Central Solenoid + !!
        • (122) f_a_cs_steel : streel fraction of Central Solenoid use numerics, only: lablxc, boundl, boundu implicit none - lablxc(122) = 'oh_steel_frac ' + lablxc(122) = 'f_a_cs_steel ' boundl(122) = 0.001D0 boundu(122) = 0.950D0 end subroutine init_itv_122 real(kind(1.d0)) function itv_122() - use pfcoil_variables, only: oh_steel_frac + use pfcoil_variables, only: f_a_cs_steel implicit none - itv_122 = oh_steel_frac + itv_122 = f_a_cs_steel end function itv_122 subroutine set_itv_122(ratio) - use pfcoil_variables, only: oh_steel_frac + use pfcoil_variables, only: f_a_cs_steel implicit none real(kind(1.d0)) :: ratio - oh_steel_frac = ratio + f_a_cs_steel = ratio end subroutine set_itv_122 !--------------------------------- diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index 6ed1ba76c7..cc06ddcb79 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -325,7 +325,7 @@ module numerics !!
        • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model !!
        • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV] !!
        • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP - !!
        • (122) oh_steel_frac : streel fraction of Central Solenoid + !!
        • (122) f_a_cs_steel : streel fraction of Central Solenoid !!
        • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72) !!
        • (124) qtargettotal : Power density on target including surface recombination [W/m2] !!
        • (125) fimp(3) : Beryllium density fraction relative to electron density diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 5b828d18ac..7049263cf4 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -217,7 +217,7 @@ module pfcoil_variables real(dp) :: f_z_cs_tf_internal !! Central solenoid height / TF coil internal height - real(dp) :: oh_steel_frac + real(dp) :: f_a_cs_steel !! central solenoid steel fraction (`iteration variable 122`) real(dp) :: pf_current_safety_factor @@ -462,7 +462,7 @@ subroutine init_pfcoil_variables n_pf_coil_groups = 3 n_cs_pf_coils = 0 f_z_cs_tf_internal = 0.71D0 - oh_steel_frac = 0.5D0 + f_a_cs_steel = 0.5D0 pf_current_safety_factor = 1.0D0 pfcaseth = 0.0D0 rho_pf_coil = 2.5D-8 diff --git a/source/fortran/scan.f90 b/source/fortran/scan.f90 index 532163026a..c80fbf56ce 100644 --- a/source/fortran/scan.f90 +++ b/source/fortran/scan.f90 @@ -101,7 +101,7 @@ module scan_module !!
        • 63 dr_cs : CS thickness (m) !!
        • 64 f_z_cs_tf_internal : CS height (m) !!
        • 65 n_cycle_min : Minimum cycles for CS stress model constraint 90 - !!
        • 66 oh_steel_frac: Steel fraction in CS coil + !!
        • 66 f_a_cs_steel: Steel fraction in CS coil !!
        • 67 t_crack_vertical: Initial crack vertical dimension (m)
        !!
      • 68 `inlet_temp_liq' : Inlet temperature of blanket liquid metal coolant/breeder (K) !!
      • 69 `outlet_temp_liq' : Outlet temperature of blanket liquid metal coolant/breeder (K) diff --git a/st_regression.IN.DAT:Zone.Identifier b/st_regression.IN.DAT:Zone.Identifier new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 8b9505c0d3..60f7ab0875 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -786,7 +786,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.1868E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.7569E+08 OP @@ -1458,9 +1458,9 @@ cpttf = 65000.0 ixc = 109 boundu(109) = 0.1 -* CS steel fraction, oh_steel_frac +* CS steel fraction, f_a_cs_steel ixc = 122 -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 * core impurity fraction, Xenon ixc = 135 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index f91ebb0d2f..57109557cc 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -787,7 +787,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.1868E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.7569E+08 OP @@ -1459,9 +1459,9 @@ cpttf = 65000.0 ixc = 109 boundu(109) = 0.1 -* CS steel fraction, oh_steel_frac +* CS steel fraction, f_a_cs_steel ixc = 122 -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 * core impurity fraction, Xenon ixc = 135 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 07787cecf7..2ec8528443 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -787,7 +787,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.1868E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.7569E+08 OP @@ -1459,9 +1459,9 @@ cpttf = 65000.0 ixc = 109 boundu(109) = 0.1 -* CS steel fraction, oh_steel_frac +* CS steel fraction, f_a_cs_steel ixc = 122 -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 * core impurity fraction, Xenon ixc = 135 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 8917744667..f3e139881e 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -787,7 +787,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.1868E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.7569E+08 OP @@ -1459,9 +1459,9 @@ cpttf = 65000.0 ixc = 109 boundu(109) = 0.1 -* CS steel fraction, oh_steel_frac +* CS steel fraction, f_a_cs_steel ixc = 122 -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 * core impurity fraction, Xenon ixc = 135 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 598b3d4fd0..6cfe542586 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -269,9 +269,9 @@ cpttf = 65000.0 ixc = 109 boundu(109) = 0.1 -* CS steel fraction, oh_steel_frac +* CS steel fraction, f_a_cs_steel ixc = 122 -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 * core impurity fraction, Xenon ixc = 135 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 6c791f7d6e..17b0632e62 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -790,7 +790,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0759E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3182E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7639E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.2019E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.2019E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6933E+08 OP @@ -1460,9 +1460,9 @@ cpttf = 65000.0 ixc = 109 boundu(109) = 0.1 -* CS steel fraction, oh_steel_frac +* CS steel fraction, f_a_cs_steel ixc = 122 -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 * core impurity fraction, Xenon ixc = 135 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index c52a92f4a8..79dcf754d2 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -71,7 +71,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 ixc = 109 * f_nd_alpha_electron boundu(109) = 0.1 -ixc = 122 * oh_steel_frac +ixc = 122 * f_a_cs_steel ixc = 135 * fimp(13) ixc = 140 * dr_tf_wp boundl(140) = 0.4 @@ -289,7 +289,7 @@ i_pf_superconductor = 3 * switch for superconductor material in PF coils; n_pf_coils_in_group = 1,1,2,2 * number of PF coils in group j n_pf_coil_groups = 4 * number of groups of PF coils; Symmetric coil pairs should all be in the same group f_z_cs_tf_internal = 0.9 * Central solenoid height / TF coil internal height -oh_steel_frac = 0.4856940627014451 * central solenoid steel fraction (`iteration variable 122`) +f_a_cs_steel = 0.4856940627014451 * central solenoid steel fraction (`iteration variable 122`) rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * average winding pack current density of PF coil i (A/m2) at time of peak rpf2 = -1.825 * offset (m) of radial position of `i_pf_location=2` PF coils from being at sigpfcf = 0.666 * fraction of JxB hoop force supported by steel case for superconducting PF coils (`ipfres=0`) diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index bf0008de39..94abba7244 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -87,7 +87,7 @@ boundl(59) = 0.50 boundu(59) = 0.94 ixc = 54 * ftmargtf ixc = 106 * ftmargoh -ixc = 122 * oh_steel_frac +ixc = 122 * f_a_cs_steel ixc = 123 * foh_stress ixc = 109 * f_nd_alpha_electron ixc = 110 * falpha_energy_confinement @@ -246,7 +246,7 @@ zref(8) = 1.0 alstroh = 6.6D8 * allowable hoop stress in Central Solenoid structural material (Pa) fcuohsu = 0.70 * copper fraction of strand in central solenoid cable i_cs_superconductor = 5 * WST Nb3Sn parameterisation -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 *----------------Physics Variables-----------------* @@ -369,7 +369,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) fcutfsu = 8.0884E-01 ftmargtf = 1.0000E+00 ftmargoh = 1.0000E+00 - oh_steel_frac = 5.7875E-01 + f_a_cs_steel = 5.7875E-01 foh_stress = 1.0000E+00 f_nd_alpha_electron = 6.8940E-02 falpha_energy_confinement = 1.0000E+00 \ No newline at end of file diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 0c8fd3ff31..abf7665c16 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -788,7 +788,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.1249E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3392E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3516E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9362E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9362E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 7.5000E+08 OP @@ -1951,7 +1951,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0885E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3236E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3618E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9713E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9713E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 7.4948E+08 OP @@ -3114,7 +3114,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0835E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3215E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3809E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9863E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9863E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 7.4954E+08 OP @@ -4277,7 +4277,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0815E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3206E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3832E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9892E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9892E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 7.4860E+08 OP @@ -5440,7 +5440,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0920E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3251E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3552E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9647E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9647E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 7.4957E+08 OP @@ -6603,7 +6603,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0641E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3132E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.2955E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9529E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9529E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 7.4964E+08 OP @@ -7766,7 +7766,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0530E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3084E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.2882E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9576E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9576E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 7.4892E+08 OP @@ -8929,7 +8929,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0522E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3081E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3098E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9709E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9709E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 7.4948E+08 OP @@ -10092,7 +10092,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0490E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3067E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3305E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9855E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9855E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 7.4900E+08 OP @@ -11255,7 +11255,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0480E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3063E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3314E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9868E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 7.4836E+08 OP @@ -12418,7 +12418,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0549E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3092E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3178E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9733E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9733E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 7.4943E+08 OP @@ -13581,7 +13581,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0476E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3061E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3029E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9706E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9706E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 7.4965E+08 OP @@ -14744,7 +14744,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0463E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3056E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3043E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9725E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9725E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 7.4900E+08 OP @@ -15907,7 +15907,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0480E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3063E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3239E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9826E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9826E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 7.4949E+08 OP @@ -17070,7 +17070,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0478E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3062E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3439E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 4.9942E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9942E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 7.4997E+08 OP @@ -17745,9 +17745,9 @@ cpttf = 65000.0 ixc = 109 boundu(109) = 0.1 -* CS steel fraction, oh_steel_frac +* CS steel fraction, f_a_cs_steel ixc = 122 -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 * core impurity fraction, Xenon ixc = 135 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index b95e2a66a4..c2dcb3a093 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -635,7 +635,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6000E+08 OP @@ -1630,7 +1630,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6000E+08 OP @@ -2625,7 +2625,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6000E+08 OP @@ -3620,7 +3620,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6000E+08 OP @@ -4615,7 +4615,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6000E+08 OP @@ -5610,7 +5610,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6000E+08 OP @@ -6605,7 +6605,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6000E+08 OP @@ -7600,7 +7600,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6000E+08 OP @@ -8595,7 +8595,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 3.3760E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 6.6000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6000E+08 OP @@ -9066,7 +9066,7 @@ boundl(59) = 0.50 boundu(59) = 0.94 ixc = 54 * ftmargtf ixc = 106 * ftmargoh -ixc = 122 * oh_steel_frac +ixc = 122 * f_a_cs_steel ixc = 123 * foh_stress ixc = 109 * f_nd_alpha_electron ixc = 110 * falpha_energy_confinement @@ -9225,7 +9225,7 @@ zref(8) = 1.0 alstroh = 6.6D8 * allowable hoop stress in Central Solenoid structural material (Pa) fcuohsu = 0.70 * copper fraction of strand in central solenoid cable i_cs_superconductor = 5 * WST Nb3Sn parameterisation -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 *----------------Physics Variables-----------------* @@ -9349,7 +9349,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) fcutfsu = 8.0884E-01 ftmargtf = 1.0000E+00 ftmargoh = 1.0000E+00 - oh_steel_frac = 5.7875E-01 + f_a_cs_steel = 5.7875E-01 foh_stress = 1.0000E+00 f_nd_alpha_electron = 6.8940E-02 falpha_energy_confinement = 1.0000E+00 \ No newline at end of file diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index bf53492210..2fba43690a 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -87,7 +87,7 @@ boundl(59) = 0.50 boundu(59) = 0.94 ixc = 54 * ftmargtf ixc = 106 * ftmargoh -ixc = 122 * oh_steel_frac +ixc = 122 * f_a_cs_steel ixc = 123 * foh_stress ixc = 109 * f_nd_alpha_electron ixc = 110 * falpha_energy_confinement @@ -246,7 +246,7 @@ zref(8) = 1.0 alstroh = 6.6D8 * allowable hoop stress in Central Solenoid structural material (Pa) fcuohsu = 0.70 * copper fraction of strand in central solenoid cable i_cs_superconductor = 5 * WST Nb3Sn parameterisation -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 *----------------Physics Variables-----------------* @@ -369,7 +369,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) fcutfsu = 8.0884E-01 ftmargtf = 1.0000E+00 ftmargoh = 1.0000E+00 - oh_steel_frac = 5.7875E-01 + f_a_cs_steel = 5.7875E-01 foh_stress = 1.0000E+00 f_nd_alpha_electron = 6.8940E-02 falpha_energy_confinement = 1.0000E+00 \ No newline at end of file diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index ff6dbb740f..b337fcfd92 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -87,7 +87,7 @@ boundl(59) = 0.50 boundu(59) = 0.94 ixc = 54 * ftmargtf ixc = 106 * ftmargoh -ixc = 122 * oh_steel_frac +ixc = 122 * f_a_cs_steel ixc = 123 * foh_stress ixc = 109 * f_nd_alpha_electron ixc = 110 * falpha_energy_confinement @@ -246,7 +246,7 @@ zref(8) = 1.0 alstroh = 6.6D8 * allowable hoop stress in Central Solenoid structural material (Pa) fcuohsu = 0.70 * copper fraction of strand in central solenoid cable i_cs_superconductor = 5 * WST Nb3Sn parameterisation -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 *----------------Physics Variables-----------------* @@ -369,7 +369,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) fcutfsu = 8.0884E-01 ftmargtf = 1.0000E+00 ftmargoh = 1.0000E+00 - oh_steel_frac = 5.7875E-01 + f_a_cs_steel = 5.7875E-01 foh_stress = 1.0000E+00 f_nd_alpha_electron = 6.8940E-02 falpha_energy_confinement = 1.0000E+00 \ No newline at end of file diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index f4fa8a9112..a74ce8a4f4 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3447,7 +3447,7 @@ "objf": null, "odep_": "dp_", "ofile": 0.0, - "oh_steel_frac": 0.5, + "f_a_cs_steel": 0.5, "dr_cs": 0.811, "f_z_cs_tf_internal": 0.71, "om": null, @@ -9956,8 +9956,8 @@ "ksic": "power fraction for outboard double-null scrape-off plasma", "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)
          \n
          \n
        • ( 1) Beta (consistency equation) (itv 5)\n
        • ( 2) Global power balance (consistency equation) (itv 10,1,2,3,4,6,11)\n
        • ( 3) Ion power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
        • ( 4) Electron power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
        • ( 5) Density upper limit (itv 9,1,2,3,4,5,6)\n
        • ( 6) (Epsilon x beta poloidal) upper limit (itv 8,1,2,3,4,6)\n
        • ( 7) Beam ion density (NBI) (consistency equation) (itv 7)\n
        • ( 8) Neutron wall load upper limit (itv 14,1,2,3,4,6)\n
        • ( 9) Fusion power upper limit (itv 26,1,2,3,4,6)\n
        • (10) Toroidal field 1/R (consistency equation) (itv 12,1,2,3,13 )\n
        • (11) Radial build (consistency equation) (itv 3,1,13,16,29,42,61)\n
        • (12) Volt second lower limit (STEADY STATE) (itv 15,1,2,3)\n
        • (13) Burn time lower limit (PULSE) (itv 21,1,16,17,29,42,44,61)\n (itv 19,1,2,3,6)\n
        • (14) Neutral beam decay lengths to plasma centre (NBI) (consistency equation)\n
        • (15) LH power threshold limit (itv 103)\n
        • (16) Net electric power lower limit (itv 25,1,2,3)\n
        • (17) Radiation fraction upper limit (itv 28)\n
        • (18) Divertor heat load upper limit (itv 27)\n
        • (19) MVA upper limit (itv 30)\n
        • (20) Neutral beam tangency radius upper limit (NBI) (itv 33,31,3,13)\n
        • (21) Plasma minor radius lower limit (itv 32)\n
        • (22) Divertor collisionality upper limit (itv 34,43)\n
        • (23) Conducting shell to plasma minor radius ratio upper limit\n (itv 104,1,74)\n
        • (24) Beta upper limit (itv 36,1,2,3,4,6,18)\n
        • (25) Peak toroidal field upper limit (itv 35,3,13,29)\n
        • (26) Central solenoid EOF current density upper limit (i_pf_conductor=0)\n (itv 38,37,41,12)\n
        • (27) Central solenoid BOP current density upper limit (i_pf_conductor=0)\n (itv 39,37,41,12)\n
        • (28) Fusion gain Q lower limit (itv 45,47,40)\n
        • (29) Inboard radial build consistency (itv 3,1,13,16,29,42,61)\n
        • (30) Injection power upper limit (itv 46,47,11)\n
        • (31) TF coil case stress upper limit (SCTF) (itv 48,56,57,58,59,60,24)\n
        • (32) TF coil conduit stress upper limit (SCTF) (itv 49,56,57,58,59,60,24)\n
        • (33) I_op / I_critical (TF coil) (SCTF) (itv 50,56,57,58,59,60,24)\n
        • (34) Dump voltage upper limit (SCTF) (itv 51,52,56,57,58,59,60,24)\n
        • (35) J_winding pack/J_protection upper limit (SCTF) (itv 53,56,57,58,59,60,24)\n
        • (36) TF coil temperature margin lower limit (SCTF) (itv 54,55,56,57,58,59,60,24)\n
        • (37) Current drive gamma upper limit (itv 40,47)\n
        • (38) First wall coolant temperature rise upper limit (itv 62)\n
        • (39) First wall peak temperature upper limit (itv 63)\n
        • (40) Start-up injection power lower limit (PULSE) (itv 64)\n
        • (41) Plasma current ramp-up time lower limit (PULSE) (itv 66,65)\n
        • (42) Cycle time lower limit (PULSE) (itv 17,67,65)\n
        • (43) Average centrepost temperature\n (TART) (consistency equation) (itv 13,20,69,70)\n
        • (44) Peak centrepost temperature upper limit (TART) (itv 68,69,70)\n
        • (45) Edge safety factor lower limit (TART) (itv 71,1,2,3)\n
        • (46) Equation for Ip/Irod upper limit (TART) (itv 72,2,60)\n
        • (47) NOT USED\n
        • (48) Poloidal beta upper limit (itv 79,2,3,18)\n
        • (49) NOT USED\n
        • (50) IFE repetition rate upper limit (IFE)\n
        • (51) Startup volt-seconds consistency (PULSE) (itv 16,29,3,1)\n
        • (52) Tritium breeding ratio lower limit (itv 89,90,91)\n
        • (53) Neutron fluence on TF coil upper limit (itv 92,93,94)\n
        • (54) Peak TF coil nuclear heating upper limit (itv 95,93,94)\n
        • (55) Vacuum vessel helium concentration upper limit i_blanket_type =2 (itv 96,93,94)\n
        • (56) Pseparatrix/Rmajor upper limit (itv 97,1,3)\n
        • (57) NOT USED\n
        • (58) NOT USED\n
        • (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 )\n
        • (60) Central solenoid temperature margin lower limit (SCTF) (itv 106)\n
        • (61) Minimum availability value (itv 107)\n
        • (62) f_alpha_energy_confinement the ratio of particle to energy confinement times (itv 110)\n
        • (63) The number of ITER-like vacuum pumps niterpump < tfno (itv 111)\n
        • (64) Zeff less than or equal to zeffmax (itv 112)\n
        • (65) Dump time set by VV loads (itv 56, 113)\n
        • (66) Limit on rate of change of energy in poloidal field\n (Use iteration variable 65(t_current_ramp_up), 115)\n
        • (67) Simple Radiation Wall load limit (itv 116, 4,6)\n
        • (68) Psep * Bt / qAR upper limit (itv 117)\n
        • (69) ensure separatrix power = the value from Kallenbach divertor (itv 118)\n
        • (70) ensure that teomp = separatrix temperature in the pedestal profile,\n (itv 119 (tesep))\n
        • (71) ensure that neomp = separatrix density (nesep) x neratio\n
        • (72) central solenoid shear stress limit (Tresca yield criterion) (itv 123 foh_stress)\n
        • (73) Psep >= Plh + Paux (itv 137 (fplhsep))\n
        • (74) TFC quench < tmax_croco (itv 141 (fcqt))\n
        • (75) TFC current/copper area < Maximum (itv 143 f_coppera_m2)\n
        • (76) Eich critical separatrix density\n
        • (77) TF coil current per turn upper limit\n
        • (78) Reinke criterion impurity fraction lower limit (itv 147 freinke)\n
        • (79) Peak CS field upper limit (itv 149 fbmaxcs)\n
        • (80) Divertor power lower limit pdivt (itv 153 fpdivlim)\n
        • (81) Ne(0) > ne(ped) constraint (itv 154 fne0)\n
        • (82) toroidalgap > tftort constraint (itv 171 ftoroidalgap)\n
        • (83) Radial build consistency for stellarators (itv 172 f_avspace)\n
        • (84) Lower limit for beta (itv 173 fbeta_min)\n
        • (85) Constraint for CP lifetime\n
        • (86) Constraint for TF coil turn dimension\n
        • (87) Constraint for cryogenic power\n
        • (88) Constraint for TF coil strain absolute value\n
        • (89) Constraint for CS coil quench protection\n
        • (90) Checking if the design point is ECRH ignitable (itv 164 fecrh_ignition)
        \n\n\n\n", "lablmm": "lablmm(ipnfoms) : labels describing figures of merit:
          \n
          \n
        • ( 1) major radius\n
        • ( 2) not used\n
        • ( 3) neutron wall load\n
        • ( 4) P_tf + P_pf\n
        • ( 5) fusion gain Q\n
        • ( 6) cost of electricity\n
        • ( 7) capital cost (direct cost if ireactor=0,\n constructed cost otherwise)\n
        • ( 8) aspect ratio\n
        • ( 9) divertor heat load\n
        • (10) toroidal field\n
        • (11) total injected power\n
        • (12) hydrogen plant capital cost OBSOLETE\n
        • (13) hydrogen production rate OBSOLETE\n
        • (14) pulse length\n
        • (15) plant availability factor (N.B. requires\n iavail=1 to be set)\n
        • (16) linear combination of major radius (minimised) and pulse length (maximised)\n note: FoM should be minimised only!\n
        • (17) net electrical output\n
        • (18) Null Figure of Merit\n
        • (19) linear combination of big Q and pulse length (maximised)\n note: FoM should be minimised only!
        \n\n\n", - "lablxc": "lablxc(ipnvars) : labels describing iteration variables
          \n
          \n
        • ( 1) aspect\n
        • ( 2) bt\n
        • ( 3) rmajor\n
        • ( 4) te\n
        • ( 5) beta\n
        • ( 6) dene\n
        • ( 7) f_nd_beam_electron\n
        • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
        • ( 9) fdene (f-value for equation 5)\n
        • (10) hfact\n
        • (11) pheat\n
        • (12) oacdcp\n
        • (13) dr_tf_inboard (NOT RECOMMENDED)\n
        • (14) fwalld (f-value for equation 8)\n
        • (15) fvs (f-value for equation 12)\n
        • (16) dr_cs\n
        • (17) tdwell\n
        • (18) q\n
        • (19) beam_energy\n
        • (20) temp_cp_average\n
        • (21) ftburn (f-value for equation 13)\n
        • (22) NOT USED\n
        • (23) fcoolcp\n
        • (24) NOT USED\n
        • (25) fpnetel (f-value for equation 16)\n
        • (26) ffuspow (f-value for equation 9)\n
        • (27) fhldiv (f-value for equation 18)\n
        • (28) fradpwr (f-value for equation 17), total radiation fraction\n
        • (29) dr_bore\n
        • (30) fmva (f-value for equation 19)\n
        • (31) gapomin\n
        • (32) frminor (f-value for equation 21)\n
        • (33) fportsz (f-value for equation 20)\n
        • (34) fdivcol (f-value for equation 22)\n
        • (35) fpeakb (f-value for equation 25)\n
        • (36) fbeta_max (f-value for equation 24)\n
        • (37) j_cs_flat_top_end\n
        • (38) fjohc (f-value for equation 26)\n
        • (39) fjohc0 (f-value for equation 27)\n
        • (40) fgamcd (f-value for equation 37)\n
        • (41) fcohbop\n
        • (42) dr_cs_tf_gap\n
        • (43) NOT USED\n
        • (44) fvsbrnni\n
        • (45) fqval (f-value for equation 28)\n
        • (46) fpinj (f-value for equation 30)\n
        • (47) feffcd\n
        • (48) fstrcase (f-value for equation 31)\n
        • (49) fstrcond (f-value for equation 32)\n
        • (50) fiooic (f-value for equation 33)\n
        • (51) fvdump (f-value for equation 34)\n
        • (52) vdalw\n
        • (53) fjprot (f-value for equation 35)\n
        • (54) ftmargtf (f-value for equation 36)\n
        • (55) NOT USED\n
        • (56) tdmptf\n
        • (57) thkcas\n
        • (58) thwcndut\n
        • (59) fcutfsu\n
        • (60) cpttf\n
        • (61) dr_shld_vv_gap_inboard\n
        • (62) fdtmp (f-value for equation 38)\n
        • (63) ftpeak (f-value for equation 39)\n
        • (64) fauxmn (f-value for equation 40)\n
        • (65) tohs\n
        • (66) ftohs (f-value for equation 41)\n
        • (67) ftcycl (f-value for equation 42)\n
        • (68) fptemp (f-value for equation 44)\n
        • (69) rcool\n
        • (70) vcool\n
        • (71) fq (f-value for equation 45)\n
        • (72) fipir (f-value for equation 46)\n
        • (73) dr_fw_plasma_gap_inboard\n
        • (74) dr_fw_plasma_gap_outboard\n
        • (75) tfootfi\n
        • (76) NOT USED\n
        • (77) NOT USED\n
        • (78) NOT USED\n
        • (79) fbeta_poloidal (f-value for equation 48)\n
        • (80) NOT USED\n
        • (81) edrive\n
        • (82) drveff\n
        • (83) tgain\n
        • (84) chrad\n
        • (85) pdrive\n
        • (86) frrmax (f-value for equation 50)\n
        • (87) NOT USED\n
        • (88) NOT USED\n
        • (89) ftbr (f-value for equation 52)\n
        • (90) blbuith\n
        • (91) blbuoth\n
        • (92) fflutf (f-value for equation 53)\n
        • (93) dr_shld_inboard\n
        • (94) dr_shld_outboard\n
        • (95) fptfnuc (f-value for equation 54)\n
        • (96) fvvhe (f-value for equation 55)\n
        • (97) fpsepr (f-value for equation 56)\n
        • (98) li6enrich\n
        • (99) NOT USED\n
        • (100) NOT USED\n
        • (101) NOT USED\n
        • (102) fimpvar\n
        • (103) fl_h_threshold (f-value for equation 15)\n
        • (104)fr_conducting_wall (f-value for equation 23)\n
        • (105) fnbshinef (f-value for equation 59)\n
        • (106) ftmargoh (f-value for equation 60)\n
        • (107) favail (f-value for equation 61)\n
        • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
        • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
        • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
        • (111) fniterpump: f-value for constraint that number\n
        • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
        • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
        • (114) len_fw_channel: Length of a single first wall channel\n
        • (115) fpoloidalpower: f-value for max rate of change of\n
        • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
        • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
        • (118) fpsep: f-value to ensure separatrix power is less than\n
        • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
        • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
        • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
        • (122) oh_steel_frac : streel fraction of Central Solenoid\n
        • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
        • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
        • (125) fimp(3) : Beryllium density fraction relative to electron density\n
        • (126) fimp(4) : Carbon density fraction relative to electron density\n
        • (127) fimp(5) : Nitrogen fraction relative to electron density\n
        • (128) fimp(6) : Oxygen density fraction relative to electron density\n
        • (129) fimp(7) : Neon density fraction relative to electron density\n
        • (130) fimp(8) : Silicon density fraction relative to electron density\n
        • (131) fimp(9) : Argon density fraction relative to electron density\n
        • (132) fimp(10) : Iron density fraction relative to electron density\n
        • (133) fimp(11) : Nickel density fraction relative to electron density\n
        • (134) fimp(12) : Krypton density fraction relative to electron density\n
        • (135) fimp(13) : Xenon density fraction relative to electron density\n
        • (136) fimp(14) : Tungsten density fraction relative to electron density\n
        • (137) fplhsep (f-value for equation 73)\n
        • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
        • (139) copper_thick : thickness of copper layer in tape (m)\n
        • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
        • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
        • (142) nesep : electron density at separatrix [m-3]\n
        • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
        • (144) fnesep : Eich critical electron density at separatrix\n
        • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
        • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
        • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
        • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
        • (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n
        • (152) fbmaxcs : Ratio of separatrix density to Greenwald density\n
        • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
        • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
        • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
        • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
        • (157) fvssu : F-value for available to required start up flux (con. 51)\n
        • (158) croco_thick : Thickness of CroCo copper tube (m)\n
        • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
        • (160) f_avspace (f-value for equation 83)\n
        • (161) fbeta_min (f-value for equation 84)\n
        • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
        • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
        • (164) f_crypmw : f-value for cryogenic plant power\n
        • (165) fstr_wp : f-value for TF coil strain absolute value\n
        • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
        • (167) fecrh_ignition: f-value for equation 90\n
        • (168) EMPTY : Description\n
        • (169) EMPTY : Description\n
        • (170) EMPTY : Description\n
        • (171) EMPTY : Description\n
        • (172) EMPTY : Description\n
        • (173) EMPTY : Description\n
        • (174) EMPTY : Description\n
        • (175) EMPTY : Description\n\n\n\n", - "lablxc": "lablxc(ipnvars) : labels describing iteration variables
            \n
            \n
          • ( 1) aspect\n
          • ( 2) bt\n
          • ( 3) rmajor\n
          • ( 4) te\n
          • ( 5) beta\n
          • ( 6) dene\n
          • ( 7) f_nd_beam_electron\n
          • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
          • ( 9) fdene (f-value for equation 5)\n
          • (10) hfact\n
          • (11) pheat\n
          • (12) oacdcp\n
          • (13) dr_tf_inboard (NOT RECOMMENDED)\n
          • (14) fwalld (f-value for equation 8)\n
          • (15) fvs (f-value for equation 12)\n
          • (16) dr_cs\n
          • (17) t_between_pulse\n
          • (18) q\n
          • (19) beam_energy\n
          • (20) temp_cp_average\n
          • (21) ft_burn (f-value for equation 13)\n
          • (22) NOT USED\n
          • (23) fcoolcp\n
          • (24) NOT USED\n
          • (25) fpnetel (f-value for equation 16)\n
          • (26) ffuspow (f-value for equation 9)\n
          • (27) fhldiv (f-value for equation 18)\n
          • (28) fradpwr (f-value for equation 17), total radiation fraction\n
          • (29) dr_bore\n
          • (30) fmva (f-value for equation 19)\n
          • (31) gapomin\n
          • (32) frminor (f-value for equation 21)\n
          • (33) fportsz (f-value for equation 20)\n
          • (34) fdivcol (f-value for equation 22)\n
          • (35) fpeakb (f-value for equation 25)\n
          • (36) fbeta_max (f-value for equation 24)\n
          • (37) j_cs_flat_top_end\n
          • (38) fjohc (f-value for equation 26)\n
          • (39) fjohc0 (f-value for equation 27)\n
          • (40) fgamcd (f-value for equation 37)\n
          • (41) fcohbop\n
          • (42) dr_cs_tf_gap\n
          • (43) NOT USED\n
          • (44) fvsbrnni\n
          • (45) fqval (f-value for equation 28)\n
          • (46) fpinj (f-value for equation 30)\n
          • (47) feffcd\n
          • (48) fstrcase (f-value for equation 31)\n
          • (49) fstrcond (f-value for equation 32)\n
          • (50) fiooic (f-value for equation 33)\n
          • (51) fvdump (f-value for equation 34)\n
          • (52) vdalw\n
          • (53) fjprot (f-value for equation 35)\n
          • (54) ftmargtf (f-value for equation 36)\n
          • (55) NOT USED\n
          • (56) tdmptf\n
          • (57) thkcas\n
          • (58) thwcndut\n
          • (59) fcutfsu\n
          • (60) cpttf\n
          • (61) dr_shld_vv_gap_inboard\n
          • (62) fdtmp (f-value for equation 38)\n
          • (63) ftpeak (f-value for equation 39)\n
          • (64) fauxmn (f-value for equation 40)\n
          • (65) t_current_ramp_up\n
          • (66) ft_current_ramp_up (f-value for equation 41)\n
          • (67) ftcycl (f-value for equation 42)\n
          • (68) fptemp (f-value for equation 44)\n
          • (69) rcool\n
          • (70) vcool\n
          • (71) fq (f-value for equation 45)\n
          • (72) fipir (f-value for equation 46)\n
          • (73) dr_fw_plasma_gap_inboard\n
          • (74) dr_fw_plasma_gap_outboard\n
          • (75) tfootfi\n
          • (76) NOT USED\n
          • (77) NOT USED\n
          • (78) NOT USED\n
          • (79) fbetap (f-value for equation 48)\n
          • (80) NOT USED\n
          • (81) edrive\n
          • (82) drveff\n
          • (83) tgain\n
          • (84) chrad\n
          • (85) pdrive\n
          • (86) frrmax (f-value for equation 50)\n
          • (87) NOT USED\n
          • (88) NOT USED\n
          • (89) ftbr (f-value for equation 52)\n
          • (90) blbuith\n
          • (91) blbuoth\n
          • (92) fflutf (f-value for equation 53)\n
          • (93) dr_shld_inboard\n
          • (94) dr_shld_outboard\n
          • (95) fptfnuc (f-value for equation 54)\n
          • (96) fvvhe (f-value for equation 55)\n
          • (97) fpsepr (f-value for equation 56)\n
          • (98) li6enrich\n
          • (99) NOT USED\n
          • (100) NOT USED\n
          • (101) NOT USED\n
          • (102) fimpvar\n
          • (103) fl_h_threshold (f-value for equation 15)\n
          • (104)fr_conducting_wall (f-value for equation 23)\n
          • (105) fnbshinef (f-value for equation 59)\n
          • (106) ftmargoh (f-value for equation 60)\n
          • (107) favail (f-value for equation 61)\n
          • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
          • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
          • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
          • (111) fniterpump: f-value for constraint that number\n
          • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
          • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
          • (114) len_fw_channel: Length of a single first wall channel\n
          • (115) fpoloidalpower: f-value for max rate of change of\n
          • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
          • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
          • (118) fpsep: f-value to ensure separatrix power is less than\n
          • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
          • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
          • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
          • (122) oh_steel_frac : streel fraction of Central Solenoid\n
          • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
          • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
          • (125) fimp(3) : Beryllium density fraction relative to electron density\n
          • (126) fimp(4) : Carbon density fraction relative to electron density\n
          • (127) fimp(5) : Nitrogen fraction relative to electron density\n
          • (128) fimp(6) : Oxygen density fraction relative to electron density\n
          • (129) fimp(7) : Neon density fraction relative to electron density\n
          • (130) fimp(8) : Silicon density fraction relative to electron density\n
          • (131) fimp(9) : Argon density fraction relative to electron density\n
          • (132) fimp(10) : Iron density fraction relative to electron density\n
          • (133) fimp(11) : Nickel density fraction relative to electron density\n
          • (134) fimp(12) : Krypton density fraction relative to electron density\n
          • (135) fimp(13) : Xenon density fraction relative to electron density\n
          • (136) fimp(14) : Tungsten density fraction relative to electron density\n
          • (137) fplhsep (f-value for equation 73)\n
          • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
          • (139) copper_thick : thickness of copper layer in tape (m)\n
          • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
          • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
          • (142) nesep : electron density at separatrix [m-3]\n
          • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
          • (144) fnesep : Eich critical electron density at separatrix\n
          • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
          • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
          • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
          • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
          • (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n
          • (152) fbmaxcs : Ratio of separatrix density to Greenwald density\n
          • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
          • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
          • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
          • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
          • (157) fvssu : F-value for available to required start up flux (con. 51)\n
          • (158) croco_thick : Thickness of CroCo copper tube (m)\n
          • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
          • (160) f_avspace (f-value for equation 83)\n
          • (161) fbeta_min (f-value for equation 84)\n
          • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
          • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
          • (164) f_crypmw : f-value for cryogenic plant power\n
          • (165) fstr_wp : f-value for TF coil strain absolute value\n
          • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
          • (167) fecrh_ignition: f-value for equation 90\n
          • (168) EMPTY : Description\n
          • (169) EMPTY : Description\n
          • (170) EMPTY : Description\n
          • (171) EMPTY : Description\n
          • (172) EMPTY : Description\n
          • (173) EMPTY : Description\n
          • (174) EMPTY : Description\n
          • (175) EMPTY : Description\n\n\n\n", + "lablxc": "lablxc(ipnvars) : labels describing iteration variables
              \n
              \n
            • ( 1) aspect\n
            • ( 2) bt\n
            • ( 3) rmajor\n
            • ( 4) te\n
            • ( 5) beta\n
            • ( 6) dene\n
            • ( 7) f_nd_beam_electron\n
            • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
            • ( 9) fdene (f-value for equation 5)\n
            • (10) hfact\n
            • (11) pheat\n
            • (12) oacdcp\n
            • (13) dr_tf_inboard (NOT RECOMMENDED)\n
            • (14) fwalld (f-value for equation 8)\n
            • (15) fvs (f-value for equation 12)\n
            • (16) dr_cs\n
            • (17) tdwell\n
            • (18) q\n
            • (19) beam_energy\n
            • (20) temp_cp_average\n
            • (21) ftburn (f-value for equation 13)\n
            • (22) NOT USED\n
            • (23) fcoolcp\n
            • (24) NOT USED\n
            • (25) fpnetel (f-value for equation 16)\n
            • (26) ffuspow (f-value for equation 9)\n
            • (27) fhldiv (f-value for equation 18)\n
            • (28) fradpwr (f-value for equation 17), total radiation fraction\n
            • (29) dr_bore\n
            • (30) fmva (f-value for equation 19)\n
            • (31) gapomin\n
            • (32) frminor (f-value for equation 21)\n
            • (33) fportsz (f-value for equation 20)\n
            • (34) fdivcol (f-value for equation 22)\n
            • (35) fpeakb (f-value for equation 25)\n
            • (36) fbeta_max (f-value for equation 24)\n
            • (37) j_cs_flat_top_end\n
            • (38) fjohc (f-value for equation 26)\n
            • (39) fjohc0 (f-value for equation 27)\n
            • (40) fgamcd (f-value for equation 37)\n
            • (41) fcohbop\n
            • (42) dr_cs_tf_gap\n
            • (43) NOT USED\n
            • (44) fvsbrnni\n
            • (45) fqval (f-value for equation 28)\n
            • (46) fpinj (f-value for equation 30)\n
            • (47) feffcd\n
            • (48) fstrcase (f-value for equation 31)\n
            • (49) fstrcond (f-value for equation 32)\n
            • (50) fiooic (f-value for equation 33)\n
            • (51) fvdump (f-value for equation 34)\n
            • (52) vdalw\n
            • (53) fjprot (f-value for equation 35)\n
            • (54) ftmargtf (f-value for equation 36)\n
            • (55) NOT USED\n
            • (56) tdmptf\n
            • (57) thkcas\n
            • (58) thwcndut\n
            • (59) fcutfsu\n
            • (60) cpttf\n
            • (61) dr_shld_vv_gap_inboard\n
            • (62) fdtmp (f-value for equation 38)\n
            • (63) ftpeak (f-value for equation 39)\n
            • (64) fauxmn (f-value for equation 40)\n
            • (65) tohs\n
            • (66) ftohs (f-value for equation 41)\n
            • (67) ftcycl (f-value for equation 42)\n
            • (68) fptemp (f-value for equation 44)\n
            • (69) rcool\n
            • (70) vcool\n
            • (71) fq (f-value for equation 45)\n
            • (72) fipir (f-value for equation 46)\n
            • (73) dr_fw_plasma_gap_inboard\n
            • (74) dr_fw_plasma_gap_outboard\n
            • (75) tfootfi\n
            • (76) NOT USED\n
            • (77) NOT USED\n
            • (78) NOT USED\n
            • (79) fbeta_poloidal (f-value for equation 48)\n
            • (80) NOT USED\n
            • (81) edrive\n
            • (82) drveff\n
            • (83) tgain\n
            • (84) chrad\n
            • (85) pdrive\n
            • (86) frrmax (f-value for equation 50)\n
            • (87) NOT USED\n
            • (88) NOT USED\n
            • (89) ftbr (f-value for equation 52)\n
            • (90) blbuith\n
            • (91) blbuoth\n
            • (92) fflutf (f-value for equation 53)\n
            • (93) dr_shld_inboard\n
            • (94) dr_shld_outboard\n
            • (95) fptfnuc (f-value for equation 54)\n
            • (96) fvvhe (f-value for equation 55)\n
            • (97) fpsepr (f-value for equation 56)\n
            • (98) li6enrich\n
            • (99) NOT USED\n
            • (100) NOT USED\n
            • (101) NOT USED\n
            • (102) fimpvar\n
            • (103) fl_h_threshold (f-value for equation 15)\n
            • (104)fr_conducting_wall (f-value for equation 23)\n
            • (105) fnbshinef (f-value for equation 59)\n
            • (106) ftmargoh (f-value for equation 60)\n
            • (107) favail (f-value for equation 61)\n
            • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
            • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
            • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
            • (111) fniterpump: f-value for constraint that number\n
            • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
            • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
            • (114) len_fw_channel: Length of a single first wall channel\n
            • (115) fpoloidalpower: f-value for max rate of change of\n
            • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
            • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
            • (118) fpsep: f-value to ensure separatrix power is less than\n
            • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
            • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
            • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
            • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
            • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
            • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
            • (125) fimp(3) : Beryllium density fraction relative to electron density\n
            • (126) fimp(4) : Carbon density fraction relative to electron density\n
            • (127) fimp(5) : Nitrogen fraction relative to electron density\n
            • (128) fimp(6) : Oxygen density fraction relative to electron density\n
            • (129) fimp(7) : Neon density fraction relative to electron density\n
            • (130) fimp(8) : Silicon density fraction relative to electron density\n
            • (131) fimp(9) : Argon density fraction relative to electron density\n
            • (132) fimp(10) : Iron density fraction relative to electron density\n
            • (133) fimp(11) : Nickel density fraction relative to electron density\n
            • (134) fimp(12) : Krypton density fraction relative to electron density\n
            • (135) fimp(13) : Xenon density fraction relative to electron density\n
            • (136) fimp(14) : Tungsten density fraction relative to electron density\n
            • (137) fplhsep (f-value for equation 73)\n
            • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
            • (139) copper_thick : thickness of copper layer in tape (m)\n
            • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
            • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
            • (142) nesep : electron density at separatrix [m-3]\n
            • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
            • (144) fnesep : Eich critical electron density at separatrix\n
            • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
            • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
            • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
            • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
            • (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n
            • (152) fbmaxcs : Ratio of separatrix density to Greenwald density\n
            • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
            • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
            • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
            • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
            • (157) fvssu : F-value for available to required start up flux (con. 51)\n
            • (158) croco_thick : Thickness of CroCo copper tube (m)\n
            • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
            • (160) f_avspace (f-value for equation 83)\n
            • (161) fbeta_min (f-value for equation 84)\n
            • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
            • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
            • (164) f_crypmw : f-value for cryogenic plant power\n
            • (165) fstr_wp : f-value for TF coil strain absolute value\n
            • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
            • (167) fecrh_ignition: f-value for equation 90\n
            • (168) EMPTY : Description\n
            • (169) EMPTY : Description\n
            • (170) EMPTY : Description\n
            • (171) EMPTY : Description\n
            • (172) EMPTY : Description\n
            • (173) EMPTY : Description\n
            • (174) EMPTY : Description\n
            • (175) EMPTY : Description\n\n\n\n", + "lablxc": "lablxc(ipnvars) : labels describing iteration variables
                \n
                \n
              • ( 1) aspect\n
              • ( 2) bt\n
              • ( 3) rmajor\n
              • ( 4) te\n
              • ( 5) beta\n
              • ( 6) dene\n
              • ( 7) f_nd_beam_electron\n
              • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
              • ( 9) fdene (f-value for equation 5)\n
              • (10) hfact\n
              • (11) pheat\n
              • (12) oacdcp\n
              • (13) dr_tf_inboard (NOT RECOMMENDED)\n
              • (14) fwalld (f-value for equation 8)\n
              • (15) fvs (f-value for equation 12)\n
              • (16) dr_cs\n
              • (17) t_between_pulse\n
              • (18) q\n
              • (19) beam_energy\n
              • (20) temp_cp_average\n
              • (21) ft_burn (f-value for equation 13)\n
              • (22) NOT USED\n
              • (23) fcoolcp\n
              • (24) NOT USED\n
              • (25) fpnetel (f-value for equation 16)\n
              • (26) ffuspow (f-value for equation 9)\n
              • (27) fhldiv (f-value for equation 18)\n
              • (28) fradpwr (f-value for equation 17), total radiation fraction\n
              • (29) dr_bore\n
              • (30) fmva (f-value for equation 19)\n
              • (31) gapomin\n
              • (32) frminor (f-value for equation 21)\n
              • (33) fportsz (f-value for equation 20)\n
              • (34) fdivcol (f-value for equation 22)\n
              • (35) fpeakb (f-value for equation 25)\n
              • (36) fbeta_max (f-value for equation 24)\n
              • (37) j_cs_flat_top_end\n
              • (38) fjohc (f-value for equation 26)\n
              • (39) fjohc0 (f-value for equation 27)\n
              • (40) fgamcd (f-value for equation 37)\n
              • (41) fcohbop\n
              • (42) dr_cs_tf_gap\n
              • (43) NOT USED\n
              • (44) fvsbrnni\n
              • (45) fqval (f-value for equation 28)\n
              • (46) fpinj (f-value for equation 30)\n
              • (47) feffcd\n
              • (48) fstrcase (f-value for equation 31)\n
              • (49) fstrcond (f-value for equation 32)\n
              • (50) fiooic (f-value for equation 33)\n
              • (51) fvdump (f-value for equation 34)\n
              • (52) vdalw\n
              • (53) fjprot (f-value for equation 35)\n
              • (54) ftmargtf (f-value for equation 36)\n
              • (55) NOT USED\n
              • (56) tdmptf\n
              • (57) thkcas\n
              • (58) thwcndut\n
              • (59) fcutfsu\n
              • (60) cpttf\n
              • (61) dr_shld_vv_gap_inboard\n
              • (62) fdtmp (f-value for equation 38)\n
              • (63) ftpeak (f-value for equation 39)\n
              • (64) fauxmn (f-value for equation 40)\n
              • (65) t_current_ramp_up\n
              • (66) ft_current_ramp_up (f-value for equation 41)\n
              • (67) ftcycl (f-value for equation 42)\n
              • (68) fptemp (f-value for equation 44)\n
              • (69) rcool\n
              • (70) vcool\n
              • (71) fq (f-value for equation 45)\n
              • (72) fipir (f-value for equation 46)\n
              • (73) dr_fw_plasma_gap_inboard\n
              • (74) dr_fw_plasma_gap_outboard\n
              • (75) tfootfi\n
              • (76) NOT USED\n
              • (77) NOT USED\n
              • (78) NOT USED\n
              • (79) fbetap (f-value for equation 48)\n
              • (80) NOT USED\n
              • (81) edrive\n
              • (82) drveff\n
              • (83) tgain\n
              • (84) chrad\n
              • (85) pdrive\n
              • (86) frrmax (f-value for equation 50)\n
              • (87) NOT USED\n
              • (88) NOT USED\n
              • (89) ftbr (f-value for equation 52)\n
              • (90) blbuith\n
              • (91) blbuoth\n
              • (92) fflutf (f-value for equation 53)\n
              • (93) dr_shld_inboard\n
              • (94) dr_shld_outboard\n
              • (95) fptfnuc (f-value for equation 54)\n
              • (96) fvvhe (f-value for equation 55)\n
              • (97) fpsepr (f-value for equation 56)\n
              • (98) li6enrich\n
              • (99) NOT USED\n
              • (100) NOT USED\n
              • (101) NOT USED\n
              • (102) fimpvar\n
              • (103) fl_h_threshold (f-value for equation 15)\n
              • (104)fr_conducting_wall (f-value for equation 23)\n
              • (105) fnbshinef (f-value for equation 59)\n
              • (106) ftmargoh (f-value for equation 60)\n
              • (107) favail (f-value for equation 61)\n
              • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
              • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
              • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
              • (111) fniterpump: f-value for constraint that number\n
              • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
              • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
              • (114) len_fw_channel: Length of a single first wall channel\n
              • (115) fpoloidalpower: f-value for max rate of change of\n
              • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
              • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
              • (118) fpsep: f-value to ensure separatrix power is less than\n
              • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
              • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
              • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
              • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
              • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
              • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
              • (125) fimp(3) : Beryllium density fraction relative to electron density\n
              • (126) fimp(4) : Carbon density fraction relative to electron density\n
              • (127) fimp(5) : Nitrogen fraction relative to electron density\n
              • (128) fimp(6) : Oxygen density fraction relative to electron density\n
              • (129) fimp(7) : Neon density fraction relative to electron density\n
              • (130) fimp(8) : Silicon density fraction relative to electron density\n
              • (131) fimp(9) : Argon density fraction relative to electron density\n
              • (132) fimp(10) : Iron density fraction relative to electron density\n
              • (133) fimp(11) : Nickel density fraction relative to electron density\n
              • (134) fimp(12) : Krypton density fraction relative to electron density\n
              • (135) fimp(13) : Xenon density fraction relative to electron density\n
              • (136) fimp(14) : Tungsten density fraction relative to electron density\n
              • (137) fplhsep (f-value for equation 73)\n
              • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
              • (139) copper_thick : thickness of copper layer in tape (m)\n
              • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
              • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
              • (142) nesep : electron density at separatrix [m-3]\n
              • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
              • (144) fnesep : Eich critical electron density at separatrix\n
              • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
              • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
              • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
              • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
              • (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n
              • (152) fbmaxcs : Ratio of separatrix density to Greenwald density\n
              • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
              • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
              • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
              • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
              • (157) fvssu : F-value for available to required start up flux (con. 51)\n
              • (158) croco_thick : Thickness of CroCo copper tube (m)\n
              • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
              • (160) f_avspace (f-value for equation 83)\n
              • (161) fbeta_min (f-value for equation 84)\n
              • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
              • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
              • (164) f_crypmw : f-value for cryogenic plant power\n
              • (165) fstr_wp : f-value for TF coil strain absolute value\n
              • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
              • (167) fecrh_ignition: f-value for equation 90\n
              • (168) EMPTY : Description\n
              • (169) EMPTY : Description\n
              • (170) EMPTY : Description\n
              • (171) EMPTY : Description\n
              • (172) EMPTY : Description\n
              • (173) EMPTY : Description\n
              • (174) EMPTY : Description\n
              • (175) EMPTY : Description\n\n\n\n", "lambda_EU": "Decay length in EUROFER [cm]", "lambda_He_VV": "Decay length [cm]", "lambda_n_BZ_IB": "Decay length in IB BZ [cm]", @@ -10206,7 +10206,7 @@ "objf": "", "odep_": "", "ofile": "", - "oh_steel_frac": "central solenoid steel fraction (`iteration variable 122`)", + "f_a_cs_steel": "central solenoid steel fraction (`iteration variable 122`)", "dr_cs": "Central solenoid thickness (m) (`iteration variable 16`)", "f_z_cs_tf_internal": "Central solenoid height / TF coil internal height", "om": "", @@ -13817,7 +13817,7 @@ "lb": 10000.0, "ub": 1000000000.0 }, - "oh_steel_frac": { + "f_a_cs_steel": { "lb": 0.001, "ub": 0.999 }, @@ -15578,7 +15578,7 @@ "lb": 100000.0, "ub": 150000000.0 }, - "oh_steel_frac": { + "f_a_cs_steel": { "lb": 0.001, "ub": 0.95 }, @@ -15820,7 +15820,7 @@ "neratio": 0.75, "nesep": 3e+19, "oacdcp": 0.0, - "oh_steel_frac": 0.5, + "f_a_cs_steel": 0.5, "dr_cs": 0.811, "pdrive": 23000000.0, "pfusife": 1000.0, @@ -15972,7 +15972,7 @@ }, "122": { "lb": 0.001, - "name": "oh_steel_frac", + "name": "f_a_cs_steel", "ub": 0.95 }, "123": { @@ -16675,7 +16675,7 @@ "12": "oacdcp", "120": "ttarget", "121": "neratio", - "122": "oh_steel_frac", + "122": "f_a_cs_steel", "123": "foh_stress", "124": "qtargettotal", "125": "fimp(03)", @@ -16933,7 +16933,7 @@ "neratio": "121", "nesep": "142", "oacdcp": "12", - "oh_steel_frac": "122", + "f_a_cs_steel": "122", "dr_cs": "16", "pdrive": "85", "pfusife": "155", @@ -18965,7 +18965,7 @@ "n_pf_coil_groups", "n_cs_pf_coils", "f_z_cs_tf_internal", - "oh_steel_frac", + "f_a_cs_steel", "pfcaseth", "rho_pf_coil", "pfmmax", @@ -20581,7 +20581,7 @@ "num_rh_systems": "int_variable", "nvar": "int_variable", "oacdcp": "real_variable", - "oh_steel_frac": "real_variable", + "f_a_cs_steel": "real_variable", "dr_cs": "real_variable", "f_z_cs_tf_internal": "real_variable", "omegan": "real_variable", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index cc35639c1c..ffc3c2fa96 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -208,7 +208,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "rjohc0", 3.048e7) monkeypatch.setattr(pfv, "s_tresca_oh", 5.718e8) monkeypatch.setattr(pfv, "awpoh", 4.232) - monkeypatch.setattr(pfv, "oh_steel_frac", 5.926e-1) + monkeypatch.setattr(pfv, "f_a_cs_steel", 5.926e-1) monkeypatch.setattr(pfv, "b_cs_peak_pulse_start", 1.4e1) monkeypatch.setattr(pfv, "rjohc", 4.070e7) monkeypatch.setattr(pfv, "temp_cs_margin", 1.5) @@ -2619,7 +2619,7 @@ def test_axial_stress(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): :param monkeypatch: mocking fixture :type monkeypatch: _pytest.monkeypatch.MonkeyPatch """ - monkeypatch.setattr(pfv, "oh_steel_frac", 0.57874999999999999) + monkeypatch.setattr(pfv, "f_a_cs_steel", 0.57874999999999999) monkeypatch.setattr(pfv, "n_cs_pf_coils", 7) monkeypatch.setattr( pfv, diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 150171d807..8a6271753a 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -269,9 +269,9 @@ cpttf = 65000.0 ixc = 109 boundu(109) = 0.1 -* CS steel fraction, oh_steel_frac +* CS steel fraction, f_a_cs_steel ixc = 122 -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 * core impurity fraction, Xenon ixc = 135 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 50a4ee30da..fa95070544 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -251,9 +251,9 @@ cpttf = 65000.0 ixc = 109 boundu(109) = 0.1 -* CS steel fraction, oh_steel_frac +* CS steel fraction, f_a_cs_steel ixc = 122 -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 * core impurity fraction, Xenon ixc = 135 diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index 5fdeb5b6c3..e7448892e2 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -71,7 +71,7 @@ boundl(60) = 65000.0 boundu(60) = 90000.0 ixc = 109 * f_nd_alpha_electron boundu(109) = 0.1 -ixc = 122 * oh_steel_frac +ixc = 122 * f_a_cs_steel ixc = 135 * fimp(13) ixc = 140 * dr_tf_wp boundl(140) = 0.4 @@ -289,7 +289,7 @@ i_pf_superconductor = 3 * switch for superconductor material in PF coils; n_pf_coils_in_group = 1,1,2,2 * number of PF coils in group j n_pf_coil_groups = 4 * number of groups of PF coils; Symmetric coil pairs should all be in the same group f_z_cs_tf_internal = 0.9 * Central solenoid height / TF coil internal height -oh_steel_frac = 0.4856940627014451 * central solenoid steel fraction (`iteration variable 122`) +f_a_cs_steel = 0.4856940627014451 * central solenoid steel fraction (`iteration variable 122`) rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * average winding pack current density of PF coil i (A/m2) at time of peak rpf2 = -1.825 * offset (m) of radial position of `i_pf_location=2` PF coils from being at sigpfcf = 0.666 * fraction of JxB hoop force supported by steel case for superconducting PF coils (`i_pf_conductor=0`) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 96f05c5be5..0e251d5f75 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1649,7 +1649,7 @@ i_pf_conductor = 0 * DESCRIPTION: Copper fraction of strand in central solenoid * JUSTIFICATION: Not yet set. -*oh_steel_frac = +*f_a_cs_steel = * DESCRIPTION: Central solenoid steel fraction * JUSTIFICATION: Not used. Using default diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 49f49ff7bb..5bc07a74ac 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -269,9 +269,9 @@ cpttf = 65000.0 ixc = 109 boundu(109) = 0.1 -* CS steel fraction, oh_steel_frac +* CS steel fraction, f_a_cs_steel ixc = 122 -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 * core impurity fraction, Xenon ixc = 135 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 871ce1b487..11f6fd1922 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -790,7 +790,7 @@ ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0759E+00 OP ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3182E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7639E+00 OP - CS_steel_area_fraction__________________________________________________ (oh_steel_frac)_______________ 5.2019E-01 ITV + CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.2019E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 Allowable_stress_in_CS_steel_(Pa)_______________________________________ (alstroh)_____________________ 7.5000E+08 Hoop_stress_in_CS_steel_(Pa)____________________________________________ (sig_hoop)____________________ 6.6933E+08 OP @@ -1460,9 +1460,9 @@ cpttf = 65000.0 ixc = 109 boundu(109) = 0.1 -* CS steel fraction, oh_steel_frac +* CS steel fraction, f_a_cs_steel ixc = 122 -oh_steel_frac = 0.8 +f_a_cs_steel = 0.8 * core impurity fraction, Xenon ixc = 135 diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index 76fff5c5d1..fbc7512e4b 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1976,7 +1976,7 @@ def test_hoop_stress(pfcoil, monkeypatch): :param monkeypatch: mocking fixture :type monkeypatch: _pytest.monkeypatch.MonkeyPatch """ - monkeypatch.setattr(pfv, "oh_steel_frac", 0.57874999999999999) + monkeypatch.setattr(pfv, "f_a_cs_steel", 0.57874999999999999) monkeypatch.setattr(pfv, "b_cs_peak_pulse_start", 13.522197474024983) monkeypatch.setattr(pfv, "j_cs_pulse_start", 19311657.760000002) monkeypatch.setattr(pfv, "n_cs_pf_coils", 7) diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index a5208aec46..a93b39f871 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -3573,7 +3573,7 @@ class StressclParam(NamedTuple): i_pf_conductor: Any = None - oh_steel_frac: Any = None + f_a_cs_steel: Any = None f_z_cs_tf_internal: Any = None @@ -3698,7 +3698,7 @@ class StressclParam(NamedTuple): str_wp=0, n_tf_wp_layers=5, i_pf_conductor=0, - oh_steel_frac=0.57874999999999999, + f_a_cs_steel=0.57874999999999999, f_z_cs_tf_internal=0.90000000000000002, j_cs_flat_top_end=20726000, j_cs_pulse_start=0, @@ -3821,7 +3821,7 @@ class StressclParam(NamedTuple): str_wp=0.0015619754370069119, n_tf_wp_layers=5, i_pf_conductor=0, - oh_steel_frac=0.57874999999999999, + f_a_cs_steel=0.57874999999999999, f_z_cs_tf_internal=0.90000000000000002, j_cs_flat_top_end=20726000, j_cs_pulse_start=19311657.760000002, @@ -3953,7 +3953,7 @@ def test_stresscl(stressclparam, monkeypatch, sctfcoil): stressclparam.n_pf_coils_in_group, 70 / 22, 3e-3, - stressclparam.oh_steel_frac, + stressclparam.f_a_cs_steel, stressclparam.eyoung_steel, stressclparam.poisson_steel, stressclparam.eyoung_cond_axial, From fef943fcf3f62427c436b1d40968e0f9b9f22b4c Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Tue, 11 Feb 2025 21:15:31 +0000 Subject: [PATCH 42/70] =?UTF-8?q?=F0=9F=94=84=20Update=20variable=20names?= =?UTF-8?q?=20for=20clarity:=20replace=20'nclsmx'=20with=20'n=5Fpf=5Fcoils?= =?UTF-8?q?=5Fin=5Fgroup=5Fmax'=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 20 +++++++++++--------- source/fortran/pfcoil.f90 | 4 ++-- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- tests/integration/test_pfcoil_int.py | 11 ++++++----- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index b54b310b65..2160bfa94f 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -73,10 +73,12 @@ def pfcoil(self): pcls0 = np.zeros(pfv.n_pf_groups_max, dtype=int) ncls0 = np.zeros(pfv.n_pf_groups_max + 2, dtype=int) - pf.rcls0, pf.zcls0 = np.zeros((2, pfv.n_pf_groups_max, pfv.nclsmx), order="F") + pf.rcls0, pf.zcls0 = np.zeros( + (2, pfv.n_pf_groups_max, pfv.n_pf_coils_in_group_max), order="F" + ) pf.ccls0 = np.zeros(int(pfv.n_pf_groups_max / 2)) sigma, work2 = np.zeros((2, pfv.n_pf_groups_max)) - rc, zc, cc, xc = np.zeros((4, pfv.nclsmx)) + rc, zc, cc, xc = np.zeros((4, pfv.n_pf_coils_in_group_max)) brin, bzin, rpts, zpts = np.zeros((4, pfv.nptsmx)) bfix, bvec = np.zeros((2, lrow1)) gmat, umat, vmat = np.zeros((3, lrow1, lcol1), order="F") @@ -97,10 +99,10 @@ def pfcoil(self): # exceeds the limit pfv.n_cs_pf_coils = 0 for i in range(pfv.n_pf_coil_groups): - if pfv.n_pf_coils_in_group[i] > pfv.nclsmx: + if pfv.n_pf_coils_in_group[i] > pfv.n_pf_coils_in_group_max: eh.idiags[0] = i eh.idiags[1] = pfv.n_pf_coils_in_group[i] - eh.idiags[2] = pfv.nclsmx + eh.idiags[2] = pfv.n_pf_coils_in_group_max eh.report_error(65) pfv.n_cs_pf_coils = pfv.n_cs_pf_coils + pfv.n_pf_coils_in_group[i] @@ -871,7 +873,7 @@ def efc( :param n_pf_coil_groups: number of coil groups, where all coils in a group have the same current, <= n_pf_groups_max :type n_pf_coil_groups: int - :param n_pf_coils_in_group: number of coils in each group, each value <= nclsmx + :param n_pf_coils_in_group: number of coils in each group, each value <= n_pf_coils_in_group_max :type n_pf_coils_in_group: np.ndarray :param rcls: coords R(i,j), Z(i,j) of coil j in group i (m) :type rcls: np.ndarray @@ -925,7 +927,7 @@ def efc( zcls, alfa, bfix, - int(pfv.nclsmx), + int(pfv.n_pf_coils_in_group_max), ) # Solve matrix equation @@ -3358,7 +3360,7 @@ def mtrx( zcls, alfa, bfix, - nclsmx, + n_pf_coils_in_group_max, ): """Calculate the currents in a group of ring coils. @@ -3388,7 +3390,7 @@ def mtrx( :param n_pf_coil_groups: number of coil groups, where all coils in a group have the same current, <= n_pf_groups_max :type n_pf_coil_groups: int - :param n_pf_coils_in_group: number of coils in each group, each value <= nclsmx + :param n_pf_coils_in_group: number of coils in each group, each value <= n_pf_coils_in_group_max :type n_pf_coils_in_group: numpy.ndarray :param rcls: coords R(i,j), Z(i,j) of coil j in group i (m) :type rcls: numpy.ndarray @@ -3407,7 +3409,7 @@ def mtrx( """ bvec = np.zeros(lrow1) gmat = np.zeros((lrow1, lcol1)) - cc = np.ones(nclsmx) + cc = np.ones(n_pf_coils_in_group_max) for i in range(npts): bvec[i] = brin[i] - bfix[i] diff --git a/source/fortran/pfcoil.f90 b/source/fortran/pfcoil.f90 index 68be6d0b4e..1fda860f45 100644 --- a/source/fortran/pfcoil.f90 +++ b/source/fortran/pfcoil.f90 @@ -13,7 +13,7 @@ module pfcoil_module use, intrinsic :: iso_fortran_env, only: dp=>real64 #endif use resistive_materials, only: volume_fractions, supercon_strand - use pfcoil_variables, only: nfixmx, n_pf_groups_max, nclsmx, ngc2 + use pfcoil_variables, only: nfixmx, n_pf_groups_max, n_pf_coils_in_group_max, ngc2 implicit none public @@ -27,7 +27,7 @@ module pfcoil_module ! with f2py if made public ! #TODO Temporarily hardcode dimensions in order to make public and wrap ! real(dp), dimension(nfixmx), private :: rfxf,zfxf,cfxf,xind - ! real(dp), dimension(n_pf_groups_max,nclsmx), private :: rcls,zcls + ! real(dp), dimension(n_pf_groups_max,n_pf_coils_in_group_max), private :: rcls,zcls ! real(dp), dimension(n_pf_groups_max), private :: ccls,ccl0 ! real(dp), dimension(ngc2), private :: bpf2 ! real(dp), dimension(ngc2,3), private :: vsdum diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 7049263cf4..ec0ad51f71 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -17,7 +17,7 @@ module pfcoil_variables integer, parameter :: n_pf_groups_max = 10 !! maximum number of groups of PF coils - integer, parameter :: nclsmx = 2 + integer, parameter :: n_pf_coils_in_group_max = 2 !! maximum number of PF coils in a given group integer, parameter :: nptsmx = 32 @@ -27,7 +27,7 @@ module pfcoil_variables integer, parameter :: nfixmx = 64 !! maximum number of fixed current PF coils - integer, parameter :: ngc = n_pf_groups_max*nclsmx + integer, parameter :: ngc = n_pf_groups_max*n_pf_coils_in_group_max !! maximum total number of coils across all groups integer, parameter :: ngc2 = ngc+2 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index a74ce8a4f4..5b6e698cd2 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3374,7 +3374,7 @@ 0.0, 0.0 ], - "nclsmx": 2.0, + "n_pf_coils_in_group_max": 2.0, "ncool": 0.0, "ne0": 0.0, "nef": 0.0, @@ -3397,7 +3397,7 @@ "nflutfo": 0.0, "nfxf": 0.0, "nfxfh": 7.0, - "ngc": "n_pf_groups_max*nclsmx", + "ngc": "n_pf_groups_max*n_pf_coils_in_group_max", "ngc2": "ngc+2", "n_pf_coil_groups": 3.0, "n_pf_groups_max": 10.0, @@ -10134,7 +10134,7 @@ "ncalls": "ncalls : number of function calls during solution", "n_pf_cs_plasma_circuits": "number of PF circuits (including central solenoid and plasma)", "n_pf_coils_in_group": "number of PF coils in group j", - "nclsmx": "maximum number of PF coils in a given group", + "n_pf_coils_in_group_max": "maximum number of PF coils in a given group", "ncool": "number of centrepost coolant tubes", "ne0": "central electron density (/m3)", "nef": "", @@ -18919,7 +18919,7 @@ ], "pfcoil_variables": [ "n_pf_groups_max", - "nclsmx", + "n_pf_coils_in_group_max", "nptsmx", "nfixmx", "ngc", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index ffc3c2fa96..81239fa6d2 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -287,6 +287,7 @@ def test_efc(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): :type monkeypatch: MonkeyPatch """ n_pf_groups_max = 10 + n_pf_coils_in_group_max = 2 nptsmx = 32 nfixmx = 64 lrow1 = 2 * nptsmx + n_pf_groups_max @@ -413,10 +414,10 @@ def test_efc(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): bfix = np.full(lrow1, 0.0) gmat = np.full([lrow1, lcol1], 0.0, order="F") bvec = np.full(lrow1, 0.0) - rc = np.full(nclsmx, 0.0) - zc = np.full(nclsmx, 0.0) - cc = np.full(nclsmx, 0.0) - xc = np.full(nclsmx, 0.0) + rc = np.full(n_pf_coils_in_group_max, 0.0) + zc = np.full(n_pf_coils_in_group_max, 0.0) + cc = np.full(n_pf_coils_in_group_max, 0.0) + xc = np.full(n_pf_coils_in_group_max, 0.0) umat = np.full([lrow1, lcol1], 0.0, order="F") vmat = np.full([lrow1, lcol1], 0.0, order="F") sigma = np.full(n_pf_groups_max, 0.0) @@ -650,7 +651,7 @@ def test_mtrx(pfcoil: PFCoil): zcls, alfa, bfix, - int(pfv.nclsmx), + int(pfv.n_pf_coils_in_group_max), ) gmat_exp = np.array([ From 99c5ce33ed2e1d422c76136883f87cf6439b9d17 Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Tue, 11 Feb 2025 21:21:16 +0000 Subject: [PATCH 43/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'cptdin'=20to=20'?= =?UTF-8?q?c=5Fpf=5Fcoil=5Fturn=5Fpeak=5Finput'=20for=20clarity=20and=20co?= =?UTF-8?q?nsistency=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/pf-coil.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/large_tokamak_IN.DAT | 2 +- examples/data/scan_MFILE.DAT | 2 +- examples/data/scan_example_file_IN.DAT | 2 +- process/pfcoil.py | 20 +++++++++++-------- process/power.py | 14 ++++++++----- process/pulse.py | 7 ++++++- process/sctfcoil.py | 10 +++++++--- source/fortran/input.f90 | 6 +++--- source/fortran/pfcoil_variables.f90 | 4 ++-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- .../data/large_tokamak_once_through.IN.DAT | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 2 +- tests/integration/data/scan_MFILE.DAT | 2 +- .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 8 ++++---- tests/integration/test_pfcoil_int.py | 4 ++-- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_power.py | 12 +++++++---- tests/unit/test_pulse.py | 12 +++++++---- tests/unit/test_sctfcoil.py | 8 ++++---- 38 files changed, 92 insertions(+), 67 deletions(-) diff --git a/documentation/proc-pages/eng-models/pf-coil.md b/documentation/proc-pages/eng-models/pf-coil.md index cc73b1ee46..68324871e9 100644 --- a/documentation/proc-pages/eng-models/pf-coil.md +++ b/documentation/proc-pages/eng-models/pf-coil.md @@ -43,7 +43,7 @@ The void fraction (for coolant) in each coil `i`'s winding pack is given by `vf( ## Coil currents -The peak current per turn, `cptdin(i)`, and the winding pack peak current density `rjconpf(i)` in +The peak current per turn, `c_pf_coil_turn_peak_input(i)`, and the winding pack peak current density `rjconpf(i)` in each PF coil `i` are inputs. The PF coil currents vary as a function of time during the tokamak operation as indicated in Figure 2. They contribute part of the flux swing necessary to maintain the plasma current. diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index b18ad1db1d..b5be2ded07 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -1734,7 +1734,7 @@ iavail = 0 ************ * Peak current per turn input for PF coil i [A] -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i i_pf_location = 2,2,3,3 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index b090a4e6ac..bcf5e776b9 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -1728,7 +1728,7 @@ iavail = 0 ************ * Peak current per turn input for PF coil i [A] -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i i_pf_location = 2,2,3,3 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 840f3cf7e1..c1ee6c01d7 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -1728,7 +1728,7 @@ iavail = 0 ************ * Peak current per turn input for PF coil i [A] -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i i_pf_location = 2,2,3,3 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 8359979ca2..7d9d4727b9 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -1729,7 +1729,7 @@ iavail = 0 ************ * Peak current per turn input for PF coil i [A] -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i i_pf_location = 2,2,3,3 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index c8b8ba8563..2601e0b5a3 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -1729,7 +1729,7 @@ iavail = 0 ************ * Peak current per turn input for PF coil i [A] -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i i_pf_location = 2,2,3,3 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 11ebc9a65f..b491790542 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -539,7 +539,7 @@ iavail = 0 ************ * Peak current per turn input for PF coil i [A] -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i i_pf_location = 2,2,3,3 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 1ca6197728..7384233ad9 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -9203,7 +9203,7 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon *-----------------Pfcoil Variables-----------------* j_cs_flat_top_end = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) -cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) +c_pf_coil_turn_peak_input = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 7759fe78f5..824bf5107e 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -539,7 +539,7 @@ iavail = 0 ************ * Peak current per turn input for PF coil i [A] -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i i_pf_location = 2,2,3,3 diff --git a/process/pfcoil.py b/process/pfcoil.py index 2160bfa94f..428b4a7b9b 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -557,9 +557,10 @@ def pfcoil(self): area = 4.0e0 * dx * dz * pfv.pf_current_safety_factor # Number of turns - # CPTDIN[i] is the current per turn (input) + # c_pf_coil_turn_peak_input[i] is the current per turn (input) pfv.n_pf_coil_turns[i] = abs( - (pfv.c_pf_cs_coils_peak_ma[i] * 1.0e6) / pfv.cptdin[i] + (pfv.c_pf_cs_coils_peak_ma[i] * 1.0e6) + / pfv.c_pf_coil_turn_peak_input[i] ) aturn[i] = area / pfv.n_pf_coil_turns[i] @@ -591,7 +592,8 @@ def pfcoil(self): ) pfv.n_pf_coil_turns[i] = abs( - (pfv.c_pf_cs_coils_peak_ma[i] * 1.0e6) / pfv.cptdin[i] + (pfv.c_pf_cs_coils_peak_ma[i] * 1.0e6) + / pfv.c_pf_coil_turn_peak_input[i] ) aturn[i] = area / pfv.n_pf_coil_turns[i] @@ -769,14 +771,16 @@ def pfcoil(self): for m in range(pfv.n_pf_coil_groups): for _n in range(pfv.n_pf_coils_in_group[m]): pfv.itr_sum = pfv.itr_sum + ( - pfv.r_pf_coil_middle[c] * pfv.n_pf_coil_turns[c] * pfv.cptdin[c] + pfv.r_pf_coil_middle[c] + * pfv.n_pf_coil_turns[c] + * pfv.c_pf_coil_turn_peak_input[c] ) c = c + 1 pfv.itr_sum = pfv.itr_sum + ( (bv.dr_bore + 0.5 * bv.dr_cs) * pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1] - * pfv.cptdin[pfv.n_cs_pf_coils - 1] + * pfv.c_pf_coil_turn_peak_input[pfv.n_cs_pf_coils - 1] ) # Find Central Solenoid information @@ -805,11 +809,11 @@ def pfcoil(self): pfv.n_pf_coil_turns[pfv.n_cs_pf_coils] = 1.0e0 # Generate coil currents as a function of time using - # user-provided waveforms etc. (cptdin, fcohbop, fcohbof) + # user-provided waveforms etc. (c_pf_coil_turn_peak_input, fcohbop, fcohbof) for k in range(6): # time points for i in range(pfv.n_pf_cs_plasma_circuits - 1): pfv.c_pf_coil_turn[i, k] = pfv.waves[i, k] * math.copysign( - pfv.cptdin[i], pfv.c_pf_cs_coils_peak_ma[i] + pfv.c_pf_coil_turn_peak_input[i], pfv.c_pf_cs_coils_peak_ma[i] ) # Plasma wave form @@ -1079,7 +1083,7 @@ def ohcalc(self): pfv.n_pf_coil_turns[pfv.n_cs_pf_coils - 1] = ( 1.0e6 * abs(pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1]) - / pfv.cptdin[pfv.n_cs_pf_coils - 1] + / pfv.c_pf_coil_turn_peak_input[pfv.n_cs_pf_coils - 1] ) # Turn vertical cross-sectionnal area diff --git a/process/power.py b/process/power.py index 1f04853fea..d900e5c800 100644 --- a/process/power.py +++ b/process/power.py @@ -103,8 +103,8 @@ def pfpwr(self, output: bool): ic = ic + pfcoil_variables.n_pf_coils_in_group[ig] # Section area of aluminium bussing for circuit (cm**2) - # pfcoil_variables.cptdin : max current per turn of coil (A) - albusa[ig] = abs(pfcoil_variables.cptdin[ic]) / 100.0e0 + # pfcoil_variables.c_pf_coil_turn_peak_input : max current per turn of coil (A) + albusa[ig] = abs(pfcoil_variables.c_pf_coil_turn_peak_input[ic]) / 100.0e0 # Resistance of bussing for circuit (ohm) # pfbusl : bus length for each PF circuit (m) @@ -133,7 +133,7 @@ def pfpwr(self, output: bool): cktr[ig] = pfcr[ig] + pfbusr[ig] # total resistance of circuit (ohms) cptburn = ( - pfcoil_variables.cptdin[ic] + pfcoil_variables.c_pf_coil_turn_peak_input[ic] * pfcoil_variables.c_pf_cs_coil_pulse_end_ma[ic] / pfcoil_variables.c_pf_cs_coils_peak_ma[ic] ) @@ -293,7 +293,9 @@ def pfpwr(self, output: bool): for jpf in range(pfcoil_variables.n_pf_cs_plasma_circuits - 1): # Power supply MVA for each PF circuit - psmva[jpf] = 1.0e-6 * abs(vpfi[jpf] * pfcoil_variables.cptdin[jpf]) + psmva[jpf] = 1.0e-6 * abs( + vpfi[jpf] * pfcoil_variables.c_pf_coil_turn_peak_input[jpf] + ) # Sum of the power supply MVA of the PF circuits pf_power_variables.spsmva = pf_power_variables.spsmva + psmva[jpf] @@ -301,7 +303,9 @@ def pfpwr(self, output: bool): # Average of the maximum currents in the PF circuits, kA pf_power_variables.acptmax = ( pf_power_variables.acptmax - + 1.0e-3 * abs(pfcoil_variables.cptdin[jpf]) / pf_power_variables.pfckts + + 1.0e-3 + * abs(pfcoil_variables.c_pf_coil_turn_peak_input[jpf]) + / pf_power_variables.pfckts ) # PF wall plug power dissipated in power supply for ohmic heating (MW) diff --git a/process/pulse.py b/process/pulse.py index e4e0fca7a7..4078bdcf65 100644 --- a/process/pulse.py +++ b/process/pulse.py @@ -78,7 +78,12 @@ def tohswg(self, output: bool) -> None: pfbusl = 8.0e0 * physics_variables.rmajor + 140.0e0 albusa = ( - abs(pfcoil_variables.cptdin[pfcoil_variables.n_cs_pf_coils - 1]) / 100.0e0 + abs( + pfcoil_variables.c_pf_coil_turn_peak_input[ + pfcoil_variables.n_cs_pf_coils - 1 + ] + ) + / 100.0e0 ) # rho = 1.5e0 * 2.62e-4 * pfbusl / albusa diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 9467de0e0a..ede2f40984 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1274,7 +1274,7 @@ def sctfcoil(self, output: bool): pfcoil_variables.i_pf_conductor, pfcoil_variables.j_cs_flat_top_end, pfcoil_variables.j_cs_pulse_start, - pfcoil_variables.cptdin, + pfcoil_variables.c_pf_coil_turn_peak_input, pfcoil_variables.n_pf_coils_in_group, pfcoil_variables.ld_ratio_cst, pfcoil_variables.r_out_cst, @@ -3589,7 +3589,7 @@ def stresscl( i_pf_conductor, j_cs_flat_top_end, j_cs_pulse_start, - cptdin, + c_pf_coil_turn_peak_input, n_pf_coils_in_group, ld_ratio_cst, r_out_cst, @@ -3790,7 +3790,11 @@ def stresscl( ) # Number of turns - n_oh_turns = 1.0e6 * curr_oh_max / cptdin[sum(n_pf_coils_in_group)] + n_oh_turns = ( + 1.0e6 + * curr_oh_max + / c_pf_coil_turn_peak_input[sum(n_pf_coils_in_group)] + ) # CS Turn vertical cross-sectionnal area a_cs_turn = a_oh / n_oh_turns diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index df7a5b1e4b..95fe5fb376 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -299,7 +299,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) j_cs_flat_top_end, sigpfcalw, alstroh, i_pf_conductor, fcupfsu, fvssu, etapsu, i_cs_stress, & fbmaxcs, ngc, rpf2, fcohbop, f_z_cs_tf_internal, vfohc, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & n_pf_coil_groups, i_pf_superconductor, nfxfh, alfapf, routr, sigpfcf, rho_pf_coil, b_cs_limit_max, & - n_pf_coils_in_group, nfixmx, cptdin, i_pf_location, i_sup_pf_shape, rref, i_pf_current, & + n_pf_coils_in_group, nfixmx, c_pf_coil_turn_peak_input, i_pf_location, i_sup_pf_shape, rref, i_pf_current, & ccl0_ma, ccls_ma, ld_ratio_cst use physics_variables, only: ipedestal, taumax, i_single_null, fvsbrnni, & rhopedt, f_vol_plasma, f_deuterium, ffwal, i_beta_component, itartpf, i_l_h_threshold, & @@ -1834,8 +1834,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('j_cs_flat_top_end') call parse_real_variable('j_cs_flat_top_end', j_cs_flat_top_end, 1.0D4, 5.0D8, & 'Central Solenoid current density at EOF') - case ('cptdin') - call parse_real_array('cptdin', cptdin, isub1, ngc2, & + case ('c_pf_coil_turn_peak_input') + call parse_real_array('c_pf_coil_turn_peak_input', c_pf_coil_turn_peak_input, isub1, ngc2, & 'Current per turn for PF coil', icode) case ('etapsu') call parse_real_variable('etapsu', etapsu, 0.0D0, 1.0D0, & diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index ec0ad51f71..52600365b5 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -80,7 +80,7 @@ module pfcoil_variables real(dp), dimension(ngc2,6) :: c_pf_coil_turn !! current per turn in coil i at time j (A) - real(dp), dimension(ngc2) :: cptdin + real(dp), dimension(ngc2) :: c_pf_coil_turn_peak_input !! peak current per turn input for PF coil i (A) real(dp), dimension(ngc2) :: c_pf_cs_coil_pulse_start_ma @@ -430,7 +430,7 @@ subroutine init_pfcoil_variables j_cs_pulse_start = 0.0D0 j_cs_flat_top_end = 1.85D7 c_pf_coil_turn = 0.0D0 - cptdin = (/4.0D4, 4.0D4, 4.0D4, & + c_pf_coil_turn_peak_input = (/4.0D4, 4.0D4, 4.0D4, & 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, & 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4, & 4.0D4, 4.0D4, 4.0D4, 4.0D4, 4.0D4/) diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 60f7ab0875..29e1320f56 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -1727,7 +1727,7 @@ iavail = 0 ************ * Peak current per turn input for PF coil i [A] -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i i_pf_location = 2,2,3,3 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 57109557cc..9928f2114e 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -1728,7 +1728,7 @@ iavail = 0 ************ * Peak current per turn input for PF coil i [A] -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i i_pf_location = 2,2,3,3 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 2ec8528443..e43d2e4bb4 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -1728,7 +1728,7 @@ iavail = 0 ************ * Peak current per turn input for PF coil i [A] -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i i_pf_location = 2,2,3,3 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index f3e139881e..752fa735d5 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -1728,7 +1728,7 @@ iavail = 0 ************ * Peak current per turn input for PF coil i [A] -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i i_pf_location = 2,2,3,3 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 6cfe542586..1396d761a9 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -538,7 +538,7 @@ iavail = 0 ************ * Peak current per turn input for PF coil i [A] -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i i_pf_location = 2,2,3,3 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 17b0632e62..1ca1eae2b7 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -1729,7 +1729,7 @@ iavail = 0 ************ * Peak current per turn input for PF coil i [A] -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i i_pf_location = 2,2,3,3 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 79dcf754d2..fe69de55df 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -280,7 +280,7 @@ epsvmc = 1e-7 * epsvmc /1;0e-6/ ; error tolerance for VMCON alstroh = 7.5d8 * allowable hoop stress in Central Solenoid structural material (Pa) j_cs_flat_top_end = 21443595.371072624 * Central solenoid overall current density at end of flat-top (A/m2) (`iteration variable 37`) (`sweep variable 62`) -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * peak current per turn input for PF coil i (A) +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * peak current per turn input for PF coil i (A) fcohbop = 0.93491189654662 * ratio of central solenoid overall current density at beginning of pulse / end of flat-top fcuohsu = 0.70 * copper fraction of strand in central solenoid i_pf_location = 2,2,3,3 * Switch for location of PF coil group i; diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 94abba7244..70419fb450 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -224,7 +224,7 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon *-----------------Pfcoil Variables-----------------* j_cs_flat_top_end = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) -cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) +c_pf_coil_turn_peak_input = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index abf7665c16..7acdcd35c0 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -18015,7 +18015,7 @@ iavail = 0 ************ * Peak current per turn input for PF coil i [A] -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i i_pf_location = 2,2,3,3 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index c2dcb3a093..644708fbfc 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -9203,7 +9203,7 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon *-----------------Pfcoil Variables-----------------* j_cs_flat_top_end = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) -cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) +c_pf_coil_turn_peak_input = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 2fba43690a..7eb9fe68da 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -224,7 +224,7 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon *-----------------Pfcoil Variables-----------------* j_cs_flat_top_end = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) -cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) +c_pf_coil_turn_peak_input = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index b337fcfd92..c28b85b623 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -224,7 +224,7 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon *-----------------Pfcoil Variables-----------------* j_cs_flat_top_end = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) -cptdin = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) +c_pf_coil_turn_peak_input = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) fcohbop = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 5b6e698cd2..b0be9c04a1 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1545,7 +1545,7 @@ "cpstcst": 0.0, "cpstflnc": 10.0, "c_pf_coil_turn": 0.0, - "cptdin": 40000.0, + "c_pf_coil_turn_peak_input": 40000.0, "cpttf": 70000.0, "cpttf_max": 90000.0, "crane_arm_h": 10.0, @@ -9207,7 +9207,7 @@ "cpstcst": "ST centrepost direct cost (M$)", "cpstflnc": "allowable ST centrepost neutron fluence (MW-yr/m2)", "c_pf_coil_turn": "current per turn in coil i at time j (A)", - "cptdin": "peak current per turn input for PF coil i (A)", + "c_pf_coil_turn_peak_input": "peak current per turn input for PF coil i (A)", "cpttf": "TF coil current per turn (A). (calculated for stellarators) (calculated for\n integer-turn TF coils `i_tf_turns_integer=1`) (`iteration variable 60`)", "cpttf_max": "Max TF coil current per turn [A]. (for stellarators and `i_tf_turns_integer=1`)\n (`constraint equation 77`)", "crane_arm_h": "vertical dimension of crane arm, operating over reactor (m)", @@ -18938,7 +18938,7 @@ "j_cs_pulse_start", "j_cs_flat_top_end", "c_pf_coil_turn", - "cptdin", + "c_pf_coil_turn_peak_input", "c_pf_cs_coil_pulse_start_ma", "c_pf_cs_coil_flat_top_ma", "c_pf_cs_coil_pulse_end_ma", @@ -20114,7 +20114,7 @@ "cowner": "real_variable", "cplife_input": "real_variable", "cpstflnc": "real_variable", - "cptdin": "real_array", + "c_pf_coil_turn_peak_input": "real_array", "cpttf": "real_variable", "cpttf_max": "real_variable", "crane_arm_h": "real_variable", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 81239fa6d2..6478d7fde1 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -69,7 +69,7 @@ def test_pfcoil(monkeypatch, pfcoil): pfv, "n_pf_coils_in_group", np.array([1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0]) ) monkeypatch.setattr(pfv, "z_pf_coil_middle", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "cptdin", np.full(22, 4.22e4)) + monkeypatch.setattr(pfv, "c_pf_coil_turn_peak_input", np.full(22, 4.22e4)) monkeypatch.setattr(pfv, "pfcaseth", np.full(22, 0.0)) monkeypatch.setattr(pfv, "itr_sum", 0.0) monkeypatch.setattr(pfv, "sigpfcf", 6.66e-1) @@ -223,7 +223,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "r_pf_coil_outer", np.full(22, 0.0)) monkeypatch.setattr(pfv, "r_pf_coil_inner", np.full(22, 0.0)) monkeypatch.setattr(pfv, "jscoh_bop", 3.562e8) - monkeypatch.setattr(pfv, "cptdin", np.full(22, 4.22e4)) + monkeypatch.setattr(pfv, "c_pf_coil_turn_peak_input", np.full(22, 4.22e4)) monkeypatch.setattr(pfv, "pfcaseth", np.full(22, 0.0)) monkeypatch.setattr(pfv, "r_pf_coil_middle", np.full(22, 0.0)) monkeypatch.setattr(pfv, "j_cs_pulse_start", 1.693e7) diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 8a6271753a..b64bf19bfe 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -538,7 +538,7 @@ iavail = 0 ************ * Peak current per turn input for PF coil i [A] -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i i_pf_location = 2,2,3,3 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index fa95070544..1f514f14d0 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -520,7 +520,7 @@ iavail = 0 ************ * Peak current per turn input for PF coil i [A] -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i i_pf_location = 2,2,3,3 diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index e7448892e2..57b8c80b24 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -280,7 +280,7 @@ epsvmc = 1e-7 * epsvmc /1;0e-6/ ; error tolerance for VMCON alstroh = 7.5d8 * allowable hoop stress in Central Solenoid structural material (Pa) j_cs_flat_top_end = 21443595.371072624 * Central solenoid overall current density at end of flat-top (A/m2) (`iteration variable 37`) (`sweep variable 62`) -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * peak current per turn input for PF coil i (A) +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * peak current per turn input for PF coil i (A) fcohbop = 0.93491189654662 * ratio of central solenoid overall current density at beginning of pulse / end of flat-top fcuohsu = 0.70 * copper fraction of strand in central solenoid i_pf_location = 2,2,3,3 * Switch for location of PF coil group i; diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 0e251d5f75..31ad51dc2e 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1955,7 +1955,7 @@ zref(4) = 5.2 * DESCRIPTION: Offset (rminor's) of Radial Position of i_pf_location=4 PF coils From Being at Rmajor * JUSTIFICATION: Position coils inside and in the middle of TF coil -*cptdin: Current per turn for PF coil +*c_pf_coil_turn_peak_input: Current per turn for PF coil *rjconpf: Current per turn for PF coil resistivity (ohm-m) *rref: Radius of i_pf_location = 4 coil groups. Number of minor radii from major radius *zref: Height of i_pf_location 3/4 coil groups. Units of minor radius diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 5bc07a74ac..139a15a132 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -539,7 +539,7 @@ iavail = 0 ************ * Peak current per turn input for PF coil i [A] -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i i_pf_location = 2,2,3,3 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 11f6fd1922..567100717f 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -1730,7 +1730,7 @@ iavail = 0 ************ * Peak current per turn input for PF coil i [A] -cptdin = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 +c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * Switch for locating scheme of pf coil group i i_pf_location = 2,2,3,3 diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 92d2819e8a..e1fcca2b3a 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -207,7 +207,7 @@ class PfpwrParam(NamedTuple): etapsu: Any = None - cptdin: Any = None + c_pf_coil_turn_peak_input: Any = None c_pf_cs_coil_pulse_end_ma: Any = None @@ -467,7 +467,7 @@ class PfpwrParam(NamedTuple): order="F", ).transpose(), etapsu=0.90000000000000002, - cptdin=np.array( + c_pf_coil_turn_peak_input=np.array( np.array( ( 42200, @@ -1210,7 +1210,7 @@ class PfpwrParam(NamedTuple): order="F", ).transpose(), etapsu=0.90000000000000002, - cptdin=np.array( + c_pf_coil_turn_peak_input=np.array( np.array( ( 42200, @@ -1820,7 +1820,11 @@ def test_pfpwr(pfpwrparam, monkeypatch, power): monkeypatch.setattr(pfcoil_variables, "etapsu", pfpwrparam.etapsu) - monkeypatch.setattr(pfcoil_variables, "cptdin", pfpwrparam.cptdin) + monkeypatch.setattr( + pfcoil_variables, + "c_pf_coil_turn_peak_input", + pfpwrparam.c_pf_coil_turn_peak_input, + ) monkeypatch.setattr( pfcoil_variables, diff --git a/tests/unit/test_pulse.py b/tests/unit/test_pulse.py index e23ad59083..216adce0e9 100644 --- a/tests/unit/test_pulse.py +++ b/tests/unit/test_pulse.py @@ -46,7 +46,7 @@ class TohswgParam(NamedTuple): n_pf_coil_turns: Any = None - cptdin: Any = None + c_pf_coil_turn_peak_input: Any = None plasma_current: Any = None @@ -523,7 +523,7 @@ class BurnParam(NamedTuple): ), order="F", ).transpose(), - cptdin=np.array( + c_pf_coil_turn_peak_input=np.array( np.array( ( 42200, @@ -1081,7 +1081,7 @@ class BurnParam(NamedTuple): ), order="F", ).transpose(), - cptdin=np.array( + c_pf_coil_turn_peak_input=np.array( np.array( ( 42200, @@ -1257,7 +1257,11 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): pfcoil_variables, "n_pf_coil_turns", tohswgparam.n_pf_coil_turns ) - monkeypatch.setattr(pfcoil_variables, "cptdin", tohswgparam.cptdin) + monkeypatch.setattr( + pfcoil_variables, + "c_pf_coil_turn_peak_input", + tohswgparam.c_pf_coil_turn_peak_input, + ) monkeypatch.setattr(physics_variables, "plasma_current", tohswgparam.plasma_current) diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index a93b39f871..230c627657 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -3583,7 +3583,7 @@ class StressclParam(NamedTuple): n_pf_coils_in_group: Any = None - cptdin: Any = None + c_pf_coil_turn_peak_input: Any = None awpc: Any = None @@ -3705,7 +3705,7 @@ class StressclParam(NamedTuple): n_pf_coils_in_group=np.array( np.array((1, 1, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0), order="F"), order="F" ).transpose(), - cptdin=np.array( + c_pf_coil_turn_peak_input=np.array( np.array( ( 42200, @@ -3828,7 +3828,7 @@ class StressclParam(NamedTuple): n_pf_coils_in_group=np.array( np.array((1, 1, 2, 2, 1, 0, 0, 0, 0, 0, 0, 0), order="F"), order="F" ).transpose(), - cptdin=np.array( + c_pf_coil_turn_peak_input=np.array( np.array( ( 42200, @@ -3949,7 +3949,7 @@ def test_stresscl(stressclparam, monkeypatch, sctfcoil): stressclparam.i_pf_conductor, stressclparam.j_cs_flat_top_end, stressclparam.j_cs_pulse_start, - stressclparam.cptdin, + stressclparam.c_pf_coil_turn_peak_input, stressclparam.n_pf_coils_in_group, 70 / 22, 3e-3, From 37f67f6412f76c42a3a8dbe932e589ebe9bbae56 Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Tue, 11 Feb 2025 21:34:35 +0000 Subject: [PATCH 44/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'fbmaxcs'=20to=20?= =?UTF-8?q?'fb=5Fcs=5Flimit=5Fmax'=20for=20clarity=20and=20consistency=20a?= =?UTF-8?q?cross=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/fortran/constraint_equations.f90 | 8 +++--- source/fortran/input.f90 | 6 ++--- source/fortran/iteration_variables.f90 | 12 ++++----- source/fortran/numerics.f90 | 4 +-- source/fortran/pfcoil_variables.f90 | 4 +-- tests/integration/ref_dicts.json | 26 +++++++++---------- .../input_files/st_regression.IN.DAT | 2 +- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 3001afbea3..98822d0156 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2987,15 +2987,15 @@ subroutine constraint_eqn_079(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! args : output structure : residual error; constraint value; residual error in physical units; output string; units string !! Equation for maximum CS field !! #=# pfcoil - !! #=#=# fbmaxcs, b_cs_peak_flat_top_end, b_cs_peak_pulse_start, b_cs_limit_max + !! #=#=# fb_cs_limit_max, b_cs_peak_flat_top_end, b_cs_peak_pulse_start, b_cs_limit_max !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. - !! fbmaxcs : input : F-value for CS mmax field (cons. 79, itvar 149) + !! fb_cs_limit_max : input : F-value for CS mmax field (cons. 79, itvar 149) !! b_cs_limit_max : input : Central solenoid max field limit [T] !! b_cs_peak_pulse_start : input : maximum field in central solenoid at beginning of pulse (T) !! b_cs_peak_flat_top_end : input real : maximum field in central solenoid at end of flat-top (EoF) (T) !! (Note: original code has "b_cs_peak_flat_top_end/b_cs_peak_pulse_start | peak CS field [T]".) - use pfcoil_variables, only: fbmaxcs, b_cs_limit_max, b_cs_peak_pulse_start, b_cs_peak_flat_top_end + use pfcoil_variables, only: fb_cs_limit_max, b_cs_limit_max, b_cs_peak_pulse_start, b_cs_peak_flat_top_end implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -3003,7 +3003,7 @@ subroutine constraint_eqn_079(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 - fbmaxcs * b_cs_limit_max/max(b_cs_peak_flat_top_end, b_cs_peak_pulse_start) + tmp_cc = 1.0D0 - fb_cs_limit_max * b_cs_limit_max/max(b_cs_peak_flat_top_end, b_cs_peak_pulse_start) tmp_con = b_cs_limit_max tmp_err = max(b_cs_peak_flat_top_end, b_cs_peak_pulse_start) * tmp_cc tmp_symbol = '<' diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 95fe5fb376..cb11429ba1 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -297,7 +297,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) epsvmc, ftol, ipnvars, ioptimz, nineqns, ipeqns, boundu, icc, ipnfoms, name_xc use pfcoil_variables, only: rhopfbus, rjconpf, zref, fcuohsu, f_a_cs_steel, vf, & j_cs_flat_top_end, sigpfcalw, alstroh, i_pf_conductor, fcupfsu, fvssu, etapsu, i_cs_stress, & - fbmaxcs, ngc, rpf2, fcohbop, f_z_cs_tf_internal, vfohc, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & + fb_cs_limit_max, ngc, rpf2, fcohbop, f_z_cs_tf_internal, vfohc, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & n_pf_coil_groups, i_pf_superconductor, nfxfh, alfapf, routr, sigpfcf, rho_pf_coil, b_cs_limit_max, & n_pf_coils_in_group, nfixmx, c_pf_coil_turn_peak_input, i_pf_location, i_sup_pf_shape, rref, i_pf_current, & ccl0_ma, ccls_ma, ld_ratio_cst @@ -1819,8 +1819,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('b_cs_limit_max') call parse_real_variable('b_cs_limit_max', b_cs_limit_max, 0.01D0, 100.0D0, & 'Maximum allowed peak field on central solenoid') - case ('fbmaxcs') - call parse_real_variable('fbmaxcs', fbmaxcs, 0.01D0, 1.0D0, & + case ('fb_cs_limit_max') + call parse_real_variable('fb_cs_limit_max', fb_cs_limit_max, 0.01D0, 1.0D0, & 'F-value for max peak CS field (con. 79, itvar 149)') case ('alstroh') call parse_real_variable('alstroh', alstroh, 1.0D6, 1.0D11, & diff --git a/source/fortran/iteration_variables.f90 b/source/fortran/iteration_variables.f90 index f800fbf53d..fca6e854fd 100755 --- a/source/fortran/iteration_variables.f90 +++ b/source/fortran/iteration_variables.f90 @@ -3318,25 +3318,25 @@ end subroutine set_itv_148 !--------------------------------- subroutine init_itv_149 - !!
              • (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149) + !!
              • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149) use numerics, only: lablxc, boundl, boundu implicit none - lablxc(149) = 'fbmaxcs ' + lablxc(149) = 'fb_cs_limit_max ' boundl(149) = 0.001D0 boundu(149) = 1.000D0 end subroutine init_itv_149 real(kind(1.d0)) function itv_149() - use pfcoil_variables, only: fbmaxcs + use pfcoil_variables, only: fb_cs_limit_max implicit none - itv_149 = fbmaxcs + itv_149 = fb_cs_limit_max end function itv_149 subroutine set_itv_149(ratio) - use pfcoil_variables, only: fbmaxcs + use pfcoil_variables, only: fb_cs_limit_max implicit none real(kind(1.d0)) :: ratio - fbmaxcs = ratio + fb_cs_limit_max = ratio end subroutine set_itv_149 !--------------------------------- diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index cc06ddcb79..416d1708c9 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -181,7 +181,7 @@ module numerics !!
              • (76) Eich critical separatrix density !!
              • (77) TF coil current per turn upper limit !!
              • (78) Reinke criterion impurity fraction lower limit (itv 147 freinke) - !!
              • (79) Peak CS field upper limit (itv 149 fbmaxcs) + !!
              • (79) Peak CS field upper limit (itv 149 fb_cs_limit_max) !!
              • (80) Divertor power lower limit pdivt (itv 153 fpdivlim) !!
              • (81) Ne(0) > ne(ped) constraint (itv 154 fne0) !!
              • (82) toroidalgap > tftort constraint (itv 171 ftoroidalgap) @@ -352,7 +352,7 @@ module numerics !!
              • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77) !!
              • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78) !!
              • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion - !!
              • (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149) + !!
              • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149) !!
              • (150) REMOVED !!
              • (151) REMOVED !!
              • (152) fgwsep : Ratio of separatrix density to Greenwald density diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 52600365b5..efebc1405a 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -390,7 +390,7 @@ module pfcoil_variables real(dp) :: b_cs_limit_max !! Central solenoid max field limit [T] - real(dp) :: fbmaxcs + real(dp) :: fb_cs_limit_max !! F-value for CS mmax field (`cons. 79`, `itvar 149`) real(dp) :: ld_ratio_cst @@ -517,7 +517,7 @@ subroutine init_pfcoil_variables zref = (/3.6D0, 1.2D0, 2.5D0, & 1.0D0, 1.0D0, 1.0D0, 1.0D0, 1.0D0, 1.0D0, 1.0D0/) b_cs_limit_max = 13.0 - fbmaxcs = 1.0 + fb_cs_limit_max = 1.0 ld_ratio_cst = 70/22 l_cond_cst = 0.0D0 d_cond_cst = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index b0be9c04a1..c1b56a907c 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1884,7 +1884,7 @@ "fblss_ccfe": 0.0, "fbltibe12": 0.0, "fblvd": 0.0, - "fbmaxcs": 13.0, + "fb_cs_limit_max": 13.0, "fbreed": 0.51, "fburn": 0.3333, "fc_building_l": 60.0, @@ -9500,7 +9500,7 @@ "fblss_ccfe": "Fractions of blanket by volume: steel, lithium orthosilicate, titanium beryllide", "fbltibe12": "Fractions of blanket by volume: steel, lithium orthosilicate, titanium beryllide", "fblvd": "vanadium fraction of blanket by volume (stellarator only)", - "fbmaxcs": "F-value for CS mmax field (`cons. 79`, `itvar 149`)", + "fb_cs_limit_max": "F-value for CS mmax field (`cons. 79`, `itvar 149`)", "fbreed": "fraction of breeder external to device core", "fburn": "IFE burn fraction (fraction of tritium fused/target)", "fc_building_l": "Fuel Cycle facilities length, width (m)", @@ -9954,10 +9954,10 @@ "ki": "", "kron": "", "ksic": "power fraction for outboard double-null scrape-off plasma", - "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)
                  \n
                  \n
                • ( 1) Beta (consistency equation) (itv 5)\n
                • ( 2) Global power balance (consistency equation) (itv 10,1,2,3,4,6,11)\n
                • ( 3) Ion power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
                • ( 4) Electron power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
                • ( 5) Density upper limit (itv 9,1,2,3,4,5,6)\n
                • ( 6) (Epsilon x beta poloidal) upper limit (itv 8,1,2,3,4,6)\n
                • ( 7) Beam ion density (NBI) (consistency equation) (itv 7)\n
                • ( 8) Neutron wall load upper limit (itv 14,1,2,3,4,6)\n
                • ( 9) Fusion power upper limit (itv 26,1,2,3,4,6)\n
                • (10) Toroidal field 1/R (consistency equation) (itv 12,1,2,3,13 )\n
                • (11) Radial build (consistency equation) (itv 3,1,13,16,29,42,61)\n
                • (12) Volt second lower limit (STEADY STATE) (itv 15,1,2,3)\n
                • (13) Burn time lower limit (PULSE) (itv 21,1,16,17,29,42,44,61)\n (itv 19,1,2,3,6)\n
                • (14) Neutral beam decay lengths to plasma centre (NBI) (consistency equation)\n
                • (15) LH power threshold limit (itv 103)\n
                • (16) Net electric power lower limit (itv 25,1,2,3)\n
                • (17) Radiation fraction upper limit (itv 28)\n
                • (18) Divertor heat load upper limit (itv 27)\n
                • (19) MVA upper limit (itv 30)\n
                • (20) Neutral beam tangency radius upper limit (NBI) (itv 33,31,3,13)\n
                • (21) Plasma minor radius lower limit (itv 32)\n
                • (22) Divertor collisionality upper limit (itv 34,43)\n
                • (23) Conducting shell to plasma minor radius ratio upper limit\n (itv 104,1,74)\n
                • (24) Beta upper limit (itv 36,1,2,3,4,6,18)\n
                • (25) Peak toroidal field upper limit (itv 35,3,13,29)\n
                • (26) Central solenoid EOF current density upper limit (i_pf_conductor=0)\n (itv 38,37,41,12)\n
                • (27) Central solenoid BOP current density upper limit (i_pf_conductor=0)\n (itv 39,37,41,12)\n
                • (28) Fusion gain Q lower limit (itv 45,47,40)\n
                • (29) Inboard radial build consistency (itv 3,1,13,16,29,42,61)\n
                • (30) Injection power upper limit (itv 46,47,11)\n
                • (31) TF coil case stress upper limit (SCTF) (itv 48,56,57,58,59,60,24)\n
                • (32) TF coil conduit stress upper limit (SCTF) (itv 49,56,57,58,59,60,24)\n
                • (33) I_op / I_critical (TF coil) (SCTF) (itv 50,56,57,58,59,60,24)\n
                • (34) Dump voltage upper limit (SCTF) (itv 51,52,56,57,58,59,60,24)\n
                • (35) J_winding pack/J_protection upper limit (SCTF) (itv 53,56,57,58,59,60,24)\n
                • (36) TF coil temperature margin lower limit (SCTF) (itv 54,55,56,57,58,59,60,24)\n
                • (37) Current drive gamma upper limit (itv 40,47)\n
                • (38) First wall coolant temperature rise upper limit (itv 62)\n
                • (39) First wall peak temperature upper limit (itv 63)\n
                • (40) Start-up injection power lower limit (PULSE) (itv 64)\n
                • (41) Plasma current ramp-up time lower limit (PULSE) (itv 66,65)\n
                • (42) Cycle time lower limit (PULSE) (itv 17,67,65)\n
                • (43) Average centrepost temperature\n (TART) (consistency equation) (itv 13,20,69,70)\n
                • (44) Peak centrepost temperature upper limit (TART) (itv 68,69,70)\n
                • (45) Edge safety factor lower limit (TART) (itv 71,1,2,3)\n
                • (46) Equation for Ip/Irod upper limit (TART) (itv 72,2,60)\n
                • (47) NOT USED\n
                • (48) Poloidal beta upper limit (itv 79,2,3,18)\n
                • (49) NOT USED\n
                • (50) IFE repetition rate upper limit (IFE)\n
                • (51) Startup volt-seconds consistency (PULSE) (itv 16,29,3,1)\n
                • (52) Tritium breeding ratio lower limit (itv 89,90,91)\n
                • (53) Neutron fluence on TF coil upper limit (itv 92,93,94)\n
                • (54) Peak TF coil nuclear heating upper limit (itv 95,93,94)\n
                • (55) Vacuum vessel helium concentration upper limit i_blanket_type =2 (itv 96,93,94)\n
                • (56) Pseparatrix/Rmajor upper limit (itv 97,1,3)\n
                • (57) NOT USED\n
                • (58) NOT USED\n
                • (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 )\n
                • (60) Central solenoid temperature margin lower limit (SCTF) (itv 106)\n
                • (61) Minimum availability value (itv 107)\n
                • (62) f_alpha_energy_confinement the ratio of particle to energy confinement times (itv 110)\n
                • (63) The number of ITER-like vacuum pumps niterpump < tfno (itv 111)\n
                • (64) Zeff less than or equal to zeffmax (itv 112)\n
                • (65) Dump time set by VV loads (itv 56, 113)\n
                • (66) Limit on rate of change of energy in poloidal field\n (Use iteration variable 65(t_current_ramp_up), 115)\n
                • (67) Simple Radiation Wall load limit (itv 116, 4,6)\n
                • (68) Psep * Bt / qAR upper limit (itv 117)\n
                • (69) ensure separatrix power = the value from Kallenbach divertor (itv 118)\n
                • (70) ensure that teomp = separatrix temperature in the pedestal profile,\n (itv 119 (tesep))\n
                • (71) ensure that neomp = separatrix density (nesep) x neratio\n
                • (72) central solenoid shear stress limit (Tresca yield criterion) (itv 123 foh_stress)\n
                • (73) Psep >= Plh + Paux (itv 137 (fplhsep))\n
                • (74) TFC quench < tmax_croco (itv 141 (fcqt))\n
                • (75) TFC current/copper area < Maximum (itv 143 f_coppera_m2)\n
                • (76) Eich critical separatrix density\n
                • (77) TF coil current per turn upper limit\n
                • (78) Reinke criterion impurity fraction lower limit (itv 147 freinke)\n
                • (79) Peak CS field upper limit (itv 149 fbmaxcs)\n
                • (80) Divertor power lower limit pdivt (itv 153 fpdivlim)\n
                • (81) Ne(0) > ne(ped) constraint (itv 154 fne0)\n
                • (82) toroidalgap > tftort constraint (itv 171 ftoroidalgap)\n
                • (83) Radial build consistency for stellarators (itv 172 f_avspace)\n
                • (84) Lower limit for beta (itv 173 fbeta_min)\n
                • (85) Constraint for CP lifetime\n
                • (86) Constraint for TF coil turn dimension\n
                • (87) Constraint for cryogenic power\n
                • (88) Constraint for TF coil strain absolute value\n
                • (89) Constraint for CS coil quench protection\n
                • (90) Checking if the design point is ECRH ignitable (itv 164 fecrh_ignition)
                \n\n\n\n", + "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)
                  \n
                  \n
                • ( 1) Beta (consistency equation) (itv 5)\n
                • ( 2) Global power balance (consistency equation) (itv 10,1,2,3,4,6,11)\n
                • ( 3) Ion power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
                • ( 4) Electron power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
                • ( 5) Density upper limit (itv 9,1,2,3,4,5,6)\n
                • ( 6) (Epsilon x beta poloidal) upper limit (itv 8,1,2,3,4,6)\n
                • ( 7) Beam ion density (NBI) (consistency equation) (itv 7)\n
                • ( 8) Neutron wall load upper limit (itv 14,1,2,3,4,6)\n
                • ( 9) Fusion power upper limit (itv 26,1,2,3,4,6)\n
                • (10) Toroidal field 1/R (consistency equation) (itv 12,1,2,3,13 )\n
                • (11) Radial build (consistency equation) (itv 3,1,13,16,29,42,61)\n
                • (12) Volt second lower limit (STEADY STATE) (itv 15,1,2,3)\n
                • (13) Burn time lower limit (PULSE) (itv 21,1,16,17,29,42,44,61)\n (itv 19,1,2,3,6)\n
                • (14) Neutral beam decay lengths to plasma centre (NBI) (consistency equation)\n
                • (15) LH power threshold limit (itv 103)\n
                • (16) Net electric power lower limit (itv 25,1,2,3)\n
                • (17) Radiation fraction upper limit (itv 28)\n
                • (18) Divertor heat load upper limit (itv 27)\n
                • (19) MVA upper limit (itv 30)\n
                • (20) Neutral beam tangency radius upper limit (NBI) (itv 33,31,3,13)\n
                • (21) Plasma minor radius lower limit (itv 32)\n
                • (22) Divertor collisionality upper limit (itv 34,43)\n
                • (23) Conducting shell to plasma minor radius ratio upper limit\n (itv 104,1,74)\n
                • (24) Beta upper limit (itv 36,1,2,3,4,6,18)\n
                • (25) Peak toroidal field upper limit (itv 35,3,13,29)\n
                • (26) Central solenoid EOF current density upper limit (i_pf_conductor=0)\n (itv 38,37,41,12)\n
                • (27) Central solenoid BOP current density upper limit (i_pf_conductor=0)\n (itv 39,37,41,12)\n
                • (28) Fusion gain Q lower limit (itv 45,47,40)\n
                • (29) Inboard radial build consistency (itv 3,1,13,16,29,42,61)\n
                • (30) Injection power upper limit (itv 46,47,11)\n
                • (31) TF coil case stress upper limit (SCTF) (itv 48,56,57,58,59,60,24)\n
                • (32) TF coil conduit stress upper limit (SCTF) (itv 49,56,57,58,59,60,24)\n
                • (33) I_op / I_critical (TF coil) (SCTF) (itv 50,56,57,58,59,60,24)\n
                • (34) Dump voltage upper limit (SCTF) (itv 51,52,56,57,58,59,60,24)\n
                • (35) J_winding pack/J_protection upper limit (SCTF) (itv 53,56,57,58,59,60,24)\n
                • (36) TF coil temperature margin lower limit (SCTF) (itv 54,55,56,57,58,59,60,24)\n
                • (37) Current drive gamma upper limit (itv 40,47)\n
                • (38) First wall coolant temperature rise upper limit (itv 62)\n
                • (39) First wall peak temperature upper limit (itv 63)\n
                • (40) Start-up injection power lower limit (PULSE) (itv 64)\n
                • (41) Plasma current ramp-up time lower limit (PULSE) (itv 66,65)\n
                • (42) Cycle time lower limit (PULSE) (itv 17,67,65)\n
                • (43) Average centrepost temperature\n (TART) (consistency equation) (itv 13,20,69,70)\n
                • (44) Peak centrepost temperature upper limit (TART) (itv 68,69,70)\n
                • (45) Edge safety factor lower limit (TART) (itv 71,1,2,3)\n
                • (46) Equation for Ip/Irod upper limit (TART) (itv 72,2,60)\n
                • (47) NOT USED\n
                • (48) Poloidal beta upper limit (itv 79,2,3,18)\n
                • (49) NOT USED\n
                • (50) IFE repetition rate upper limit (IFE)\n
                • (51) Startup volt-seconds consistency (PULSE) (itv 16,29,3,1)\n
                • (52) Tritium breeding ratio lower limit (itv 89,90,91)\n
                • (53) Neutron fluence on TF coil upper limit (itv 92,93,94)\n
                • (54) Peak TF coil nuclear heating upper limit (itv 95,93,94)\n
                • (55) Vacuum vessel helium concentration upper limit i_blanket_type =2 (itv 96,93,94)\n
                • (56) Pseparatrix/Rmajor upper limit (itv 97,1,3)\n
                • (57) NOT USED\n
                • (58) NOT USED\n
                • (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 )\n
                • (60) Central solenoid temperature margin lower limit (SCTF) (itv 106)\n
                • (61) Minimum availability value (itv 107)\n
                • (62) f_alpha_energy_confinement the ratio of particle to energy confinement times (itv 110)\n
                • (63) The number of ITER-like vacuum pumps niterpump < tfno (itv 111)\n
                • (64) Zeff less than or equal to zeffmax (itv 112)\n
                • (65) Dump time set by VV loads (itv 56, 113)\n
                • (66) Limit on rate of change of energy in poloidal field\n (Use iteration variable 65(t_current_ramp_up), 115)\n
                • (67) Simple Radiation Wall load limit (itv 116, 4,6)\n
                • (68) Psep * Bt / qAR upper limit (itv 117)\n
                • (69) ensure separatrix power = the value from Kallenbach divertor (itv 118)\n
                • (70) ensure that teomp = separatrix temperature in the pedestal profile,\n (itv 119 (tesep))\n
                • (71) ensure that neomp = separatrix density (nesep) x neratio\n
                • (72) central solenoid shear stress limit (Tresca yield criterion) (itv 123 foh_stress)\n
                • (73) Psep >= Plh + Paux (itv 137 (fplhsep))\n
                • (74) TFC quench < tmax_croco (itv 141 (fcqt))\n
                • (75) TFC current/copper area < Maximum (itv 143 f_coppera_m2)\n
                • (76) Eich critical separatrix density\n
                • (77) TF coil current per turn upper limit\n
                • (78) Reinke criterion impurity fraction lower limit (itv 147 freinke)\n
                • (79) Peak CS field upper limit (itv 149 fb_cs_limit_max)\n
                • (80) Divertor power lower limit pdivt (itv 153 fpdivlim)\n
                • (81) Ne(0) > ne(ped) constraint (itv 154 fne0)\n
                • (82) toroidalgap > tftort constraint (itv 171 ftoroidalgap)\n
                • (83) Radial build consistency for stellarators (itv 172 f_avspace)\n
                • (84) Lower limit for beta (itv 173 fbeta_min)\n
                • (85) Constraint for CP lifetime\n
                • (86) Constraint for TF coil turn dimension\n
                • (87) Constraint for cryogenic power\n
                • (88) Constraint for TF coil strain absolute value\n
                • (89) Constraint for CS coil quench protection\n
                • (90) Checking if the design point is ECRH ignitable (itv 164 fecrh_ignition)
                \n\n\n\n", "lablmm": "lablmm(ipnfoms) : labels describing figures of merit:
                  \n
                  \n
                • ( 1) major radius\n
                • ( 2) not used\n
                • ( 3) neutron wall load\n
                • ( 4) P_tf + P_pf\n
                • ( 5) fusion gain Q\n
                • ( 6) cost of electricity\n
                • ( 7) capital cost (direct cost if ireactor=0,\n constructed cost otherwise)\n
                • ( 8) aspect ratio\n
                • ( 9) divertor heat load\n
                • (10) toroidal field\n
                • (11) total injected power\n
                • (12) hydrogen plant capital cost OBSOLETE\n
                • (13) hydrogen production rate OBSOLETE\n
                • (14) pulse length\n
                • (15) plant availability factor (N.B. requires\n iavail=1 to be set)\n
                • (16) linear combination of major radius (minimised) and pulse length (maximised)\n note: FoM should be minimised only!\n
                • (17) net electrical output\n
                • (18) Null Figure of Merit\n
                • (19) linear combination of big Q and pulse length (maximised)\n note: FoM should be minimised only!
                \n\n\n", - "lablxc": "lablxc(ipnvars) : labels describing iteration variables
                  \n
                  \n
                • ( 1) aspect\n
                • ( 2) bt\n
                • ( 3) rmajor\n
                • ( 4) te\n
                • ( 5) beta\n
                • ( 6) dene\n
                • ( 7) f_nd_beam_electron\n
                • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
                • ( 9) fdene (f-value for equation 5)\n
                • (10) hfact\n
                • (11) pheat\n
                • (12) oacdcp\n
                • (13) dr_tf_inboard (NOT RECOMMENDED)\n
                • (14) fwalld (f-value for equation 8)\n
                • (15) fvs (f-value for equation 12)\n
                • (16) dr_cs\n
                • (17) tdwell\n
                • (18) q\n
                • (19) beam_energy\n
                • (20) temp_cp_average\n
                • (21) ftburn (f-value for equation 13)\n
                • (22) NOT USED\n
                • (23) fcoolcp\n
                • (24) NOT USED\n
                • (25) fpnetel (f-value for equation 16)\n
                • (26) ffuspow (f-value for equation 9)\n
                • (27) fhldiv (f-value for equation 18)\n
                • (28) fradpwr (f-value for equation 17), total radiation fraction\n
                • (29) dr_bore\n
                • (30) fmva (f-value for equation 19)\n
                • (31) gapomin\n
                • (32) frminor (f-value for equation 21)\n
                • (33) fportsz (f-value for equation 20)\n
                • (34) fdivcol (f-value for equation 22)\n
                • (35) fpeakb (f-value for equation 25)\n
                • (36) fbeta_max (f-value for equation 24)\n
                • (37) j_cs_flat_top_end\n
                • (38) fjohc (f-value for equation 26)\n
                • (39) fjohc0 (f-value for equation 27)\n
                • (40) fgamcd (f-value for equation 37)\n
                • (41) fcohbop\n
                • (42) dr_cs_tf_gap\n
                • (43) NOT USED\n
                • (44) fvsbrnni\n
                • (45) fqval (f-value for equation 28)\n
                • (46) fpinj (f-value for equation 30)\n
                • (47) feffcd\n
                • (48) fstrcase (f-value for equation 31)\n
                • (49) fstrcond (f-value for equation 32)\n
                • (50) fiooic (f-value for equation 33)\n
                • (51) fvdump (f-value for equation 34)\n
                • (52) vdalw\n
                • (53) fjprot (f-value for equation 35)\n
                • (54) ftmargtf (f-value for equation 36)\n
                • (55) NOT USED\n
                • (56) tdmptf\n
                • (57) thkcas\n
                • (58) thwcndut\n
                • (59) fcutfsu\n
                • (60) cpttf\n
                • (61) dr_shld_vv_gap_inboard\n
                • (62) fdtmp (f-value for equation 38)\n
                • (63) ftpeak (f-value for equation 39)\n
                • (64) fauxmn (f-value for equation 40)\n
                • (65) tohs\n
                • (66) ftohs (f-value for equation 41)\n
                • (67) ftcycl (f-value for equation 42)\n
                • (68) fptemp (f-value for equation 44)\n
                • (69) rcool\n
                • (70) vcool\n
                • (71) fq (f-value for equation 45)\n
                • (72) fipir (f-value for equation 46)\n
                • (73) dr_fw_plasma_gap_inboard\n
                • (74) dr_fw_plasma_gap_outboard\n
                • (75) tfootfi\n
                • (76) NOT USED\n
                • (77) NOT USED\n
                • (78) NOT USED\n
                • (79) fbeta_poloidal (f-value for equation 48)\n
                • (80) NOT USED\n
                • (81) edrive\n
                • (82) drveff\n
                • (83) tgain\n
                • (84) chrad\n
                • (85) pdrive\n
                • (86) frrmax (f-value for equation 50)\n
                • (87) NOT USED\n
                • (88) NOT USED\n
                • (89) ftbr (f-value for equation 52)\n
                • (90) blbuith\n
                • (91) blbuoth\n
                • (92) fflutf (f-value for equation 53)\n
                • (93) dr_shld_inboard\n
                • (94) dr_shld_outboard\n
                • (95) fptfnuc (f-value for equation 54)\n
                • (96) fvvhe (f-value for equation 55)\n
                • (97) fpsepr (f-value for equation 56)\n
                • (98) li6enrich\n
                • (99) NOT USED\n
                • (100) NOT USED\n
                • (101) NOT USED\n
                • (102) fimpvar\n
                • (103) fl_h_threshold (f-value for equation 15)\n
                • (104)fr_conducting_wall (f-value for equation 23)\n
                • (105) fnbshinef (f-value for equation 59)\n
                • (106) ftmargoh (f-value for equation 60)\n
                • (107) favail (f-value for equation 61)\n
                • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
                • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
                • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
                • (111) fniterpump: f-value for constraint that number\n
                • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
                • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
                • (114) len_fw_channel: Length of a single first wall channel\n
                • (115) fpoloidalpower: f-value for max rate of change of\n
                • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
                • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
                • (118) fpsep: f-value to ensure separatrix power is less than\n
                • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
                • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
                • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
                • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
                • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
                • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
                • (125) fimp(3) : Beryllium density fraction relative to electron density\n
                • (126) fimp(4) : Carbon density fraction relative to electron density\n
                • (127) fimp(5) : Nitrogen fraction relative to electron density\n
                • (128) fimp(6) : Oxygen density fraction relative to electron density\n
                • (129) fimp(7) : Neon density fraction relative to electron density\n
                • (130) fimp(8) : Silicon density fraction relative to electron density\n
                • (131) fimp(9) : Argon density fraction relative to electron density\n
                • (132) fimp(10) : Iron density fraction relative to electron density\n
                • (133) fimp(11) : Nickel density fraction relative to electron density\n
                • (134) fimp(12) : Krypton density fraction relative to electron density\n
                • (135) fimp(13) : Xenon density fraction relative to electron density\n
                • (136) fimp(14) : Tungsten density fraction relative to electron density\n
                • (137) fplhsep (f-value for equation 73)\n
                • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
                • (139) copper_thick : thickness of copper layer in tape (m)\n
                • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
                • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
                • (142) nesep : electron density at separatrix [m-3]\n
                • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
                • (144) fnesep : Eich critical electron density at separatrix\n
                • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
                • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
                • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
                • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
                • (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n
                • (152) fbmaxcs : Ratio of separatrix density to Greenwald density\n
                • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
                • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
                • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
                • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
                • (157) fvssu : F-value for available to required start up flux (con. 51)\n
                • (158) croco_thick : Thickness of CroCo copper tube (m)\n
                • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
                • (160) f_avspace (f-value for equation 83)\n
                • (161) fbeta_min (f-value for equation 84)\n
                • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
                • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
                • (164) f_crypmw : f-value for cryogenic plant power\n
                • (165) fstr_wp : f-value for TF coil strain absolute value\n
                • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
                • (167) fecrh_ignition: f-value for equation 90\n
                • (168) EMPTY : Description\n
                • (169) EMPTY : Description\n
                • (170) EMPTY : Description\n
                • (171) EMPTY : Description\n
                • (172) EMPTY : Description\n
                • (173) EMPTY : Description\n
                • (174) EMPTY : Description\n
                • (175) EMPTY : Description\n\n\n\n", - "lablxc": "lablxc(ipnvars) : labels describing iteration variables
                    \n
                    \n
                  • ( 1) aspect\n
                  • ( 2) bt\n
                  • ( 3) rmajor\n
                  • ( 4) te\n
                  • ( 5) beta\n
                  • ( 6) dene\n
                  • ( 7) f_nd_beam_electron\n
                  • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
                  • ( 9) fdene (f-value for equation 5)\n
                  • (10) hfact\n
                  • (11) pheat\n
                  • (12) oacdcp\n
                  • (13) dr_tf_inboard (NOT RECOMMENDED)\n
                  • (14) fwalld (f-value for equation 8)\n
                  • (15) fvs (f-value for equation 12)\n
                  • (16) dr_cs\n
                  • (17) t_between_pulse\n
                  • (18) q\n
                  • (19) beam_energy\n
                  • (20) temp_cp_average\n
                  • (21) ft_burn (f-value for equation 13)\n
                  • (22) NOT USED\n
                  • (23) fcoolcp\n
                  • (24) NOT USED\n
                  • (25) fpnetel (f-value for equation 16)\n
                  • (26) ffuspow (f-value for equation 9)\n
                  • (27) fhldiv (f-value for equation 18)\n
                  • (28) fradpwr (f-value for equation 17), total radiation fraction\n
                  • (29) dr_bore\n
                  • (30) fmva (f-value for equation 19)\n
                  • (31) gapomin\n
                  • (32) frminor (f-value for equation 21)\n
                  • (33) fportsz (f-value for equation 20)\n
                  • (34) fdivcol (f-value for equation 22)\n
                  • (35) fpeakb (f-value for equation 25)\n
                  • (36) fbeta_max (f-value for equation 24)\n
                  • (37) j_cs_flat_top_end\n
                  • (38) fjohc (f-value for equation 26)\n
                  • (39) fjohc0 (f-value for equation 27)\n
                  • (40) fgamcd (f-value for equation 37)\n
                  • (41) fcohbop\n
                  • (42) dr_cs_tf_gap\n
                  • (43) NOT USED\n
                  • (44) fvsbrnni\n
                  • (45) fqval (f-value for equation 28)\n
                  • (46) fpinj (f-value for equation 30)\n
                  • (47) feffcd\n
                  • (48) fstrcase (f-value for equation 31)\n
                  • (49) fstrcond (f-value for equation 32)\n
                  • (50) fiooic (f-value for equation 33)\n
                  • (51) fvdump (f-value for equation 34)\n
                  • (52) vdalw\n
                  • (53) fjprot (f-value for equation 35)\n
                  • (54) ftmargtf (f-value for equation 36)\n
                  • (55) NOT USED\n
                  • (56) tdmptf\n
                  • (57) thkcas\n
                  • (58) thwcndut\n
                  • (59) fcutfsu\n
                  • (60) cpttf\n
                  • (61) dr_shld_vv_gap_inboard\n
                  • (62) fdtmp (f-value for equation 38)\n
                  • (63) ftpeak (f-value for equation 39)\n
                  • (64) fauxmn (f-value for equation 40)\n
                  • (65) t_current_ramp_up\n
                  • (66) ft_current_ramp_up (f-value for equation 41)\n
                  • (67) ftcycl (f-value for equation 42)\n
                  • (68) fptemp (f-value for equation 44)\n
                  • (69) rcool\n
                  • (70) vcool\n
                  • (71) fq (f-value for equation 45)\n
                  • (72) fipir (f-value for equation 46)\n
                  • (73) dr_fw_plasma_gap_inboard\n
                  • (74) dr_fw_plasma_gap_outboard\n
                  • (75) tfootfi\n
                  • (76) NOT USED\n
                  • (77) NOT USED\n
                  • (78) NOT USED\n
                  • (79) fbetap (f-value for equation 48)\n
                  • (80) NOT USED\n
                  • (81) edrive\n
                  • (82) drveff\n
                  • (83) tgain\n
                  • (84) chrad\n
                  • (85) pdrive\n
                  • (86) frrmax (f-value for equation 50)\n
                  • (87) NOT USED\n
                  • (88) NOT USED\n
                  • (89) ftbr (f-value for equation 52)\n
                  • (90) blbuith\n
                  • (91) blbuoth\n
                  • (92) fflutf (f-value for equation 53)\n
                  • (93) dr_shld_inboard\n
                  • (94) dr_shld_outboard\n
                  • (95) fptfnuc (f-value for equation 54)\n
                  • (96) fvvhe (f-value for equation 55)\n
                  • (97) fpsepr (f-value for equation 56)\n
                  • (98) li6enrich\n
                  • (99) NOT USED\n
                  • (100) NOT USED\n
                  • (101) NOT USED\n
                  • (102) fimpvar\n
                  • (103) fl_h_threshold (f-value for equation 15)\n
                  • (104)fr_conducting_wall (f-value for equation 23)\n
                  • (105) fnbshinef (f-value for equation 59)\n
                  • (106) ftmargoh (f-value for equation 60)\n
                  • (107) favail (f-value for equation 61)\n
                  • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
                  • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
                  • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
                  • (111) fniterpump: f-value for constraint that number\n
                  • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
                  • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
                  • (114) len_fw_channel: Length of a single first wall channel\n
                  • (115) fpoloidalpower: f-value for max rate of change of\n
                  • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
                  • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
                  • (118) fpsep: f-value to ensure separatrix power is less than\n
                  • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
                  • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
                  • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
                  • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
                  • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
                  • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
                  • (125) fimp(3) : Beryllium density fraction relative to electron density\n
                  • (126) fimp(4) : Carbon density fraction relative to electron density\n
                  • (127) fimp(5) : Nitrogen fraction relative to electron density\n
                  • (128) fimp(6) : Oxygen density fraction relative to electron density\n
                  • (129) fimp(7) : Neon density fraction relative to electron density\n
                  • (130) fimp(8) : Silicon density fraction relative to electron density\n
                  • (131) fimp(9) : Argon density fraction relative to electron density\n
                  • (132) fimp(10) : Iron density fraction relative to electron density\n
                  • (133) fimp(11) : Nickel density fraction relative to electron density\n
                  • (134) fimp(12) : Krypton density fraction relative to electron density\n
                  • (135) fimp(13) : Xenon density fraction relative to electron density\n
                  • (136) fimp(14) : Tungsten density fraction relative to electron density\n
                  • (137) fplhsep (f-value for equation 73)\n
                  • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
                  • (139) copper_thick : thickness of copper layer in tape (m)\n
                  • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
                  • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
                  • (142) nesep : electron density at separatrix [m-3]\n
                  • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
                  • (144) fnesep : Eich critical electron density at separatrix\n
                  • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
                  • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
                  • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
                  • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
                  • (149) fbmaxcs : F-value for max peak CS field (con. 79, itvar 149)\n
                  • (152) fbmaxcs : Ratio of separatrix density to Greenwald density\n
                  • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
                  • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
                  • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
                  • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
                  • (157) fvssu : F-value for available to required start up flux (con. 51)\n
                  • (158) croco_thick : Thickness of CroCo copper tube (m)\n
                  • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
                  • (160) f_avspace (f-value for equation 83)\n
                  • (161) fbeta_min (f-value for equation 84)\n
                  • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
                  • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
                  • (164) f_crypmw : f-value for cryogenic plant power\n
                  • (165) fstr_wp : f-value for TF coil strain absolute value\n
                  • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
                  • (167) fecrh_ignition: f-value for equation 90\n
                  • (168) EMPTY : Description\n
                  • (169) EMPTY : Description\n
                  • (170) EMPTY : Description\n
                  • (171) EMPTY : Description\n
                  • (172) EMPTY : Description\n
                  • (173) EMPTY : Description\n
                  • (174) EMPTY : Description\n
                  • (175) EMPTY : Description\n\n\n\n", + "lablxc": "lablxc(ipnvars) : labels describing iteration variables
                      \n
                      \n
                    • ( 1) aspect\n
                    • ( 2) bt\n
                    • ( 3) rmajor\n
                    • ( 4) te\n
                    • ( 5) beta\n
                    • ( 6) dene\n
                    • ( 7) f_nd_beam_electron\n
                    • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
                    • ( 9) fdene (f-value for equation 5)\n
                    • (10) hfact\n
                    • (11) pheat\n
                    • (12) oacdcp\n
                    • (13) dr_tf_inboard (NOT RECOMMENDED)\n
                    • (14) fwalld (f-value for equation 8)\n
                    • (15) fvs (f-value for equation 12)\n
                    • (16) dr_cs\n
                    • (17) tdwell\n
                    • (18) q\n
                    • (19) beam_energy\n
                    • (20) temp_cp_average\n
                    • (21) ftburn (f-value for equation 13)\n
                    • (22) NOT USED\n
                    • (23) fcoolcp\n
                    • (24) NOT USED\n
                    • (25) fpnetel (f-value for equation 16)\n
                    • (26) ffuspow (f-value for equation 9)\n
                    • (27) fhldiv (f-value for equation 18)\n
                    • (28) fradpwr (f-value for equation 17), total radiation fraction\n
                    • (29) dr_bore\n
                    • (30) fmva (f-value for equation 19)\n
                    • (31) gapomin\n
                    • (32) frminor (f-value for equation 21)\n
                    • (33) fportsz (f-value for equation 20)\n
                    • (34) fdivcol (f-value for equation 22)\n
                    • (35) fpeakb (f-value for equation 25)\n
                    • (36) fbeta_max (f-value for equation 24)\n
                    • (37) j_cs_flat_top_end\n
                    • (38) fjohc (f-value for equation 26)\n
                    • (39) fjohc0 (f-value for equation 27)\n
                    • (40) fgamcd (f-value for equation 37)\n
                    • (41) fcohbop\n
                    • (42) dr_cs_tf_gap\n
                    • (43) NOT USED\n
                    • (44) fvsbrnni\n
                    • (45) fqval (f-value for equation 28)\n
                    • (46) fpinj (f-value for equation 30)\n
                    • (47) feffcd\n
                    • (48) fstrcase (f-value for equation 31)\n
                    • (49) fstrcond (f-value for equation 32)\n
                    • (50) fiooic (f-value for equation 33)\n
                    • (51) fvdump (f-value for equation 34)\n
                    • (52) vdalw\n
                    • (53) fjprot (f-value for equation 35)\n
                    • (54) ftmargtf (f-value for equation 36)\n
                    • (55) NOT USED\n
                    • (56) tdmptf\n
                    • (57) thkcas\n
                    • (58) thwcndut\n
                    • (59) fcutfsu\n
                    • (60) cpttf\n
                    • (61) dr_shld_vv_gap_inboard\n
                    • (62) fdtmp (f-value for equation 38)\n
                    • (63) ftpeak (f-value for equation 39)\n
                    • (64) fauxmn (f-value for equation 40)\n
                    • (65) tohs\n
                    • (66) ftohs (f-value for equation 41)\n
                    • (67) ftcycl (f-value for equation 42)\n
                    • (68) fptemp (f-value for equation 44)\n
                    • (69) rcool\n
                    • (70) vcool\n
                    • (71) fq (f-value for equation 45)\n
                    • (72) fipir (f-value for equation 46)\n
                    • (73) dr_fw_plasma_gap_inboard\n
                    • (74) dr_fw_plasma_gap_outboard\n
                    • (75) tfootfi\n
                    • (76) NOT USED\n
                    • (77) NOT USED\n
                    • (78) NOT USED\n
                    • (79) fbeta_poloidal (f-value for equation 48)\n
                    • (80) NOT USED\n
                    • (81) edrive\n
                    • (82) drveff\n
                    • (83) tgain\n
                    • (84) chrad\n
                    • (85) pdrive\n
                    • (86) frrmax (f-value for equation 50)\n
                    • (87) NOT USED\n
                    • (88) NOT USED\n
                    • (89) ftbr (f-value for equation 52)\n
                    • (90) blbuith\n
                    • (91) blbuoth\n
                    • (92) fflutf (f-value for equation 53)\n
                    • (93) dr_shld_inboard\n
                    • (94) dr_shld_outboard\n
                    • (95) fptfnuc (f-value for equation 54)\n
                    • (96) fvvhe (f-value for equation 55)\n
                    • (97) fpsepr (f-value for equation 56)\n
                    • (98) li6enrich\n
                    • (99) NOT USED\n
                    • (100) NOT USED\n
                    • (101) NOT USED\n
                    • (102) fimpvar\n
                    • (103) fl_h_threshold (f-value for equation 15)\n
                    • (104)fr_conducting_wall (f-value for equation 23)\n
                    • (105) fnbshinef (f-value for equation 59)\n
                    • (106) ftmargoh (f-value for equation 60)\n
                    • (107) favail (f-value for equation 61)\n
                    • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
                    • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
                    • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
                    • (111) fniterpump: f-value for constraint that number\n
                    • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
                    • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
                    • (114) len_fw_channel: Length of a single first wall channel\n
                    • (115) fpoloidalpower: f-value for max rate of change of\n
                    • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
                    • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
                    • (118) fpsep: f-value to ensure separatrix power is less than\n
                    • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
                    • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
                    • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
                    • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
                    • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
                    • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
                    • (125) fimp(3) : Beryllium density fraction relative to electron density\n
                    • (126) fimp(4) : Carbon density fraction relative to electron density\n
                    • (127) fimp(5) : Nitrogen fraction relative to electron density\n
                    • (128) fimp(6) : Oxygen density fraction relative to electron density\n
                    • (129) fimp(7) : Neon density fraction relative to electron density\n
                    • (130) fimp(8) : Silicon density fraction relative to electron density\n
                    • (131) fimp(9) : Argon density fraction relative to electron density\n
                    • (132) fimp(10) : Iron density fraction relative to electron density\n
                    • (133) fimp(11) : Nickel density fraction relative to electron density\n
                    • (134) fimp(12) : Krypton density fraction relative to electron density\n
                    • (135) fimp(13) : Xenon density fraction relative to electron density\n
                    • (136) fimp(14) : Tungsten density fraction relative to electron density\n
                    • (137) fplhsep (f-value for equation 73)\n
                    • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
                    • (139) copper_thick : thickness of copper layer in tape (m)\n
                    • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
                    • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
                    • (142) nesep : electron density at separatrix [m-3]\n
                    • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
                    • (144) fnesep : Eich critical electron density at separatrix\n
                    • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
                    • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
                    • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
                    • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
                    • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
                    • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
                    • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
                    • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
                    • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
                    • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
                    • (157) fvssu : F-value for available to required start up flux (con. 51)\n
                    • (158) croco_thick : Thickness of CroCo copper tube (m)\n
                    • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
                    • (160) f_avspace (f-value for equation 83)\n
                    • (161) fbeta_min (f-value for equation 84)\n
                    • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
                    • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
                    • (164) f_crypmw : f-value for cryogenic plant power\n
                    • (165) fstr_wp : f-value for TF coil strain absolute value\n
                    • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
                    • (167) fecrh_ignition: f-value for equation 90\n
                    • (168) EMPTY : Description\n
                    • (169) EMPTY : Description\n
                    • (170) EMPTY : Description\n
                    • (171) EMPTY : Description\n
                    • (172) EMPTY : Description\n
                    • (173) EMPTY : Description\n
                    • (174) EMPTY : Description\n
                    • (175) EMPTY : Description\n\n\n\n", + "lablxc": "lablxc(ipnvars) : labels describing iteration variables
                        \n
                        \n
                      • ( 1) aspect\n
                      • ( 2) bt\n
                      • ( 3) rmajor\n
                      • ( 4) te\n
                      • ( 5) beta\n
                      • ( 6) dene\n
                      • ( 7) f_nd_beam_electron\n
                      • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
                      • ( 9) fdene (f-value for equation 5)\n
                      • (10) hfact\n
                      • (11) pheat\n
                      • (12) oacdcp\n
                      • (13) dr_tf_inboard (NOT RECOMMENDED)\n
                      • (14) fwalld (f-value for equation 8)\n
                      • (15) fvs (f-value for equation 12)\n
                      • (16) dr_cs\n
                      • (17) t_between_pulse\n
                      • (18) q\n
                      • (19) beam_energy\n
                      • (20) temp_cp_average\n
                      • (21) ft_burn (f-value for equation 13)\n
                      • (22) NOT USED\n
                      • (23) fcoolcp\n
                      • (24) NOT USED\n
                      • (25) fpnetel (f-value for equation 16)\n
                      • (26) ffuspow (f-value for equation 9)\n
                      • (27) fhldiv (f-value for equation 18)\n
                      • (28) fradpwr (f-value for equation 17), total radiation fraction\n
                      • (29) dr_bore\n
                      • (30) fmva (f-value for equation 19)\n
                      • (31) gapomin\n
                      • (32) frminor (f-value for equation 21)\n
                      • (33) fportsz (f-value for equation 20)\n
                      • (34) fdivcol (f-value for equation 22)\n
                      • (35) fpeakb (f-value for equation 25)\n
                      • (36) fbeta_max (f-value for equation 24)\n
                      • (37) j_cs_flat_top_end\n
                      • (38) fjohc (f-value for equation 26)\n
                      • (39) fjohc0 (f-value for equation 27)\n
                      • (40) fgamcd (f-value for equation 37)\n
                      • (41) fcohbop\n
                      • (42) dr_cs_tf_gap\n
                      • (43) NOT USED\n
                      • (44) fvsbrnni\n
                      • (45) fqval (f-value for equation 28)\n
                      • (46) fpinj (f-value for equation 30)\n
                      • (47) feffcd\n
                      • (48) fstrcase (f-value for equation 31)\n
                      • (49) fstrcond (f-value for equation 32)\n
                      • (50) fiooic (f-value for equation 33)\n
                      • (51) fvdump (f-value for equation 34)\n
                      • (52) vdalw\n
                      • (53) fjprot (f-value for equation 35)\n
                      • (54) ftmargtf (f-value for equation 36)\n
                      • (55) NOT USED\n
                      • (56) tdmptf\n
                      • (57) thkcas\n
                      • (58) thwcndut\n
                      • (59) fcutfsu\n
                      • (60) cpttf\n
                      • (61) dr_shld_vv_gap_inboard\n
                      • (62) fdtmp (f-value for equation 38)\n
                      • (63) ftpeak (f-value for equation 39)\n
                      • (64) fauxmn (f-value for equation 40)\n
                      • (65) t_current_ramp_up\n
                      • (66) ft_current_ramp_up (f-value for equation 41)\n
                      • (67) ftcycl (f-value for equation 42)\n
                      • (68) fptemp (f-value for equation 44)\n
                      • (69) rcool\n
                      • (70) vcool\n
                      • (71) fq (f-value for equation 45)\n
                      • (72) fipir (f-value for equation 46)\n
                      • (73) dr_fw_plasma_gap_inboard\n
                      • (74) dr_fw_plasma_gap_outboard\n
                      • (75) tfootfi\n
                      • (76) NOT USED\n
                      • (77) NOT USED\n
                      • (78) NOT USED\n
                      • (79) fbetap (f-value for equation 48)\n
                      • (80) NOT USED\n
                      • (81) edrive\n
                      • (82) drveff\n
                      • (83) tgain\n
                      • (84) chrad\n
                      • (85) pdrive\n
                      • (86) frrmax (f-value for equation 50)\n
                      • (87) NOT USED\n
                      • (88) NOT USED\n
                      • (89) ftbr (f-value for equation 52)\n
                      • (90) blbuith\n
                      • (91) blbuoth\n
                      • (92) fflutf (f-value for equation 53)\n
                      • (93) dr_shld_inboard\n
                      • (94) dr_shld_outboard\n
                      • (95) fptfnuc (f-value for equation 54)\n
                      • (96) fvvhe (f-value for equation 55)\n
                      • (97) fpsepr (f-value for equation 56)\n
                      • (98) li6enrich\n
                      • (99) NOT USED\n
                      • (100) NOT USED\n
                      • (101) NOT USED\n
                      • (102) fimpvar\n
                      • (103) fl_h_threshold (f-value for equation 15)\n
                      • (104)fr_conducting_wall (f-value for equation 23)\n
                      • (105) fnbshinef (f-value for equation 59)\n
                      • (106) ftmargoh (f-value for equation 60)\n
                      • (107) favail (f-value for equation 61)\n
                      • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
                      • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
                      • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
                      • (111) fniterpump: f-value for constraint that number\n
                      • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
                      • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
                      • (114) len_fw_channel: Length of a single first wall channel\n
                      • (115) fpoloidalpower: f-value for max rate of change of\n
                      • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
                      • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
                      • (118) fpsep: f-value to ensure separatrix power is less than\n
                      • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
                      • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
                      • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
                      • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
                      • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
                      • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
                      • (125) fimp(3) : Beryllium density fraction relative to electron density\n
                      • (126) fimp(4) : Carbon density fraction relative to electron density\n
                      • (127) fimp(5) : Nitrogen fraction relative to electron density\n
                      • (128) fimp(6) : Oxygen density fraction relative to electron density\n
                      • (129) fimp(7) : Neon density fraction relative to electron density\n
                      • (130) fimp(8) : Silicon density fraction relative to electron density\n
                      • (131) fimp(9) : Argon density fraction relative to electron density\n
                      • (132) fimp(10) : Iron density fraction relative to electron density\n
                      • (133) fimp(11) : Nickel density fraction relative to electron density\n
                      • (134) fimp(12) : Krypton density fraction relative to electron density\n
                      • (135) fimp(13) : Xenon density fraction relative to electron density\n
                      • (136) fimp(14) : Tungsten density fraction relative to electron density\n
                      • (137) fplhsep (f-value for equation 73)\n
                      • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
                      • (139) copper_thick : thickness of copper layer in tape (m)\n
                      • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
                      • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
                      • (142) nesep : electron density at separatrix [m-3]\n
                      • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
                      • (144) fnesep : Eich critical electron density at separatrix\n
                      • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
                      • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
                      • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
                      • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
                      • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
                      • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
                      • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
                      • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
                      • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
                      • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
                      • (157) fvssu : F-value for available to required start up flux (con. 51)\n
                      • (158) croco_thick : Thickness of CroCo copper tube (m)\n
                      • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
                      • (160) f_avspace (f-value for equation 83)\n
                      • (161) fbeta_min (f-value for equation 84)\n
                      • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
                      • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
                      • (164) f_crypmw : f-value for cryogenic plant power\n
                      • (165) fstr_wp : f-value for TF coil strain absolute value\n
                      • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
                      • (167) fecrh_ignition: f-value for equation 90\n
                      • (168) EMPTY : Description\n
                      • (169) EMPTY : Description\n
                      • (170) EMPTY : Description\n
                      • (171) EMPTY : Description\n
                      • (172) EMPTY : Description\n
                      • (173) EMPTY : Description\n
                      • (174) EMPTY : Description\n
                      • (175) EMPTY : Description\n\n\n\n", "lambda_EU": "Decay length in EUROFER [cm]", "lambda_He_VV": "Decay length [cm]", "lambda_n_BZ_IB": "Decay length in IB BZ [cm]", @@ -12533,7 +12533,7 @@ "lb": 0.0, "ub": 1.0 }, - "fbmaxcs": { + "fb_cs_limit_max": { "lb": 0.01, "ub": 1.0 }, @@ -15214,7 +15214,7 @@ "lb": 0.01, "ub": 1.0 }, - "fbmaxcs": { + "fb_cs_limit_max": { "lb": 0.001, "ub": 1.0 }, @@ -15741,7 +15741,7 @@ "fbeta_poloidal": 1.0, "fbeta_max": 1.0, "fbeta_min": 1.0, - "fbmaxcs": 13.0, + "fb_cs_limit_max": 13.0, "fcohbop": 0.9, "fcoolcp": 0.3, "fcpttf": 1.0, @@ -16117,7 +16117,7 @@ }, "149": { "lb": 0.001, - "name": "fbmaxcs", + "name": "fb_cs_limit_max", "ub": 1.0 }, "15": { @@ -16704,7 +16704,7 @@ "146": "fcpttf", "147": "freinke", "148": "fzactual", - "149": "fbmaxcs", + "149": "fb_cs_limit_max", "15": "fvs", "152": "fgwsep", "153": "fpdivlim", @@ -16842,7 +16842,7 @@ "fbeta_poloidal": "79", "fbeta_max": "36", "fbeta_min": "161", - "fbmaxcs": "149", + "fb_cs_limit_max": "149", "fcohbop": "41", "fcoolcp": "23", "fcpttf": "146", @@ -19013,7 +19013,7 @@ "z_pf_coil_middle", "zref", "b_cs_limit_max", - "fbmaxcs" + "fb_cs_limit_max" ], "physics_functions_module": [ "vcritx" @@ -20242,7 +20242,7 @@ "fbllipb": "real_variable", "fblss": "real_variable", "fblvd": "real_variable", - "fbmaxcs": "real_variable", + "fb_cs_limit_max": "real_variable", "fbreed": "real_variable", "fburn": "real_variable", "fc_building_l": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 31ad51dc2e..1a0ccb01c3 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1740,7 +1740,7 @@ i_pf_conductor = 0 * JUSTIFICATION: Not using icc=79 *ixc = 149 -*fbmaxcs = +*fb_cs_limit_max = *boundl(149) *boundu(149) * DESCRIPTION: F-value for max peak CS field (icc = 79) From 205cddb61b07de4e122a80a35820fbad9e5e3387 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 09:54:56 +0000 Subject: [PATCH 45/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'rjconpf'=20to=20?= =?UTF-8?q?'j=5Fpf=5Fcoil=5Fwp=5Fpeak'=20for=20clarity=20and=20consistency?= =?UTF-8?q?=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- documentation/proc-pages/eng-models/pf-coil.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/large_tokamak_IN.DAT | 2 +- examples/data/scan_MFILE.DAT | 2 +- examples/data/scan_example_file_IN.DAT | 2 +- process/costs.py | 6 +++--- process/pfcoil.py | 18 ++++++++++++------ process/power.py | 2 +- source/fortran/input.f90 | 6 +++--- source/fortran/pfcoil_variables.f90 | 4 ++-- .../integration/data/large_tokamak_1_MFILE.DAT | 2 +- .../integration/data/large_tokamak_2_MFILE.DAT | 2 +- .../integration/data/large_tokamak_3_MFILE.DAT | 2 +- .../integration/data/large_tokamak_4_MFILE.DAT | 2 +- tests/integration/data/large_tokamak_IN.DAT | 2 +- tests/integration/data/large_tokamak_MFILE.DAT | 2 +- .../data/large_tokamak_once_through.IN.DAT | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 2 +- tests/integration/data/scan_MFILE.DAT | 2 +- .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 8 ++++---- tests/integration/test_pfcoil_int.py | 2 +- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_costs_1990.py | 12 +++++++----- tests/unit/test_power.py | 10 ++++++---- 36 files changed, 66 insertions(+), 56 deletions(-) diff --git a/documentation/proc-pages/eng-models/pf-coil.md b/documentation/proc-pages/eng-models/pf-coil.md index 68324871e9..2243c70c84 100644 --- a/documentation/proc-pages/eng-models/pf-coil.md +++ b/documentation/proc-pages/eng-models/pf-coil.md @@ -43,7 +43,7 @@ The void fraction (for coolant) in each coil `i`'s winding pack is given by `vf( ## Coil currents -The peak current per turn, `c_pf_coil_turn_peak_input(i)`, and the winding pack peak current density `rjconpf(i)` in +The peak current per turn, `c_pf_coil_turn_peak_input(i)`, and the winding pack peak current density `j_pf_coil_wp_peak(i)` in each PF coil `i` are inputs. The PF coil currents vary as a function of time during the tokamak operation as indicated in Figure 2. They contribute part of the flux swing necessary to maintain the plasma current. diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index b5be2ded07..df5e269c98 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -1752,7 +1752,7 @@ n_pf_coil_groups = 4 f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index bcf5e776b9..c3bacc41f4 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -1746,7 +1746,7 @@ n_pf_coil_groups = 4 f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index c1ee6c01d7..ce89e4564f 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -1746,7 +1746,7 @@ n_pf_coil_groups = 4 f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 7d9d4727b9..04c5a34568 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -1747,7 +1747,7 @@ n_pf_coil_groups = 4 f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 2601e0b5a3..ab171c2570 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -1747,7 +1747,7 @@ n_pf_coil_groups = 4 f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index b491790542..73f40a6b3c 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -557,7 +557,7 @@ n_pf_coil_groups = 4 f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 7384233ad9..13c67f07ed 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -9210,7 +9210,7 @@ i_pf_superconductor = 3 * Switch for superconductor material in pf coils; n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j n_pf_coil_groups = 4 * Number of groups of pf coils; f_z_cs_tf_internal = 0.9 * Central solenoid height / tf coil internal height -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils zref(1) = 3.6 diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 824bf5107e..793aa7b2e1 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -557,7 +557,7 @@ n_pf_coil_groups = 4 f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 diff --git a/process/costs.py b/process/costs.py index c9f93aabe9..fa607c4886 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1593,7 +1593,7 @@ def acc2222(self): / pfcoil_variables.n_pf_coil_turns[i] ) * 1.0e6 - / pfcoil_variables.rjconpf[i] + / pfcoil_variables.j_pf_coil_wp_peak[i] * tfcoil_variables.dcond[ pfcoil_variables.i_pf_superconductor - 1 ] @@ -1625,7 +1625,7 @@ def acc2222(self): / pfcoil_variables.n_pf_coil_turns[i] ) * 1.0e6 - / pfcoil_variables.rjconpf[i] + / pfcoil_variables.j_pf_coil_wp_peak[i] * constants.dcopper ) else: @@ -1637,7 +1637,7 @@ def acc2222(self): / pfcoil_variables.n_pf_coil_turns[i] ) * 1.0e6 - / pfcoil_variables.rjconpf[i] + / pfcoil_variables.j_pf_coil_wp_peak[i] * constants.dcopper ) diff --git a/process/pfcoil.py b/process/pfcoil.py index 428b4a7b9b..96ab2d9528 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -565,7 +565,9 @@ def pfcoil(self): aturn[i] = area / pfv.n_pf_coil_turns[i] # Actual winding pack current density - pfv.rjconpf[i] = 1.0e6 * abs(pfv.c_pf_cs_coils_peak_ma[i]) / area + pfv.j_pf_coil_wp_peak[i] = ( + 1.0e6 * abs(pfv.c_pf_cs_coils_peak_ma[i]) / area + ) # Location of edges of each coil: # r_pf_coil_inner = inner radius, r_pf_coil_outer = outer radius @@ -584,10 +586,14 @@ def pfcoil(self): pfv.z_pf_coil_upper[i] = pfv.z_pf_coil_middle[i] - dz else: - # Other coils. N.B. Current density RJCONPF[i] is defined in + # Other coils. N.B. Current density j_pf_coil_wp_peak[i] is defined in # routine INITIAL for these coils. area = ( - abs(pfv.c_pf_cs_coils_peak_ma[i] * 1.0e6 / pfv.rjconpf[i]) + abs( + pfv.c_pf_cs_coils_peak_ma[i] + * 1.0e6 + / pfv.j_pf_coil_wp_peak[i] + ) * pfv.pf_current_safety_factor ) @@ -644,7 +650,7 @@ def pfcoil(self): bmax, pfv.vf[i], pfv.fcupfsu, - pfv.rjconpf[i], + pfv.j_pf_coil_wp_peak[i], pfv.i_pf_superconductor, tfv.fhts, tfv.str_pf_con_res, @@ -2612,12 +2618,12 @@ def outpf(self): if pfv.i_pf_conductor == 0: op.write( self.outfile, - f"PF {k}\t{pfv.c_pf_cs_coils_peak_ma[k]:.2e}\t{pfv.j_pf_wp_critical[k]:.2e}\t{pfv.rjconpf[k]:.2e}\t{pfv.rjconpf[k] / pfv.j_pf_wp_critical[k]:.2e}\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.m_pf_coil_structure[k]:.2e}\t{pfv.b_pf_coil_peak[k]:.2e}", + f"PF {k}\t{pfv.c_pf_cs_coils_peak_ma[k]:.2e}\t{pfv.j_pf_wp_critical[k]:.2e}\t{pfv.j_pf_coil_wp_peak[k]:.2e}\t{pfv.j_pf_coil_wp_peak[k] / pfv.j_pf_wp_critical[k]:.2e}\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.m_pf_coil_structure[k]:.2e}\t{pfv.b_pf_coil_peak[k]:.2e}", ) else: op.write( self.outfile, - f"PF {k}\t{pfv.c_pf_cs_coils_peak_ma[k]:.2e}\t-1.0e0\t{pfv.rjconpf[k]:.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.m_pf_coil_structure[k]:.2e}\t{pfv.b_pf_coil_peak[k]:.2e}\t", + f"PF {k}\t{pfv.c_pf_cs_coils_peak_ma[k]:.2e}\t-1.0e0\t{pfv.j_pf_coil_wp_peak[k]:.2e}\t1.0e0\t{pfv.m_pf_coil_conductor[k]:.2e}\t{pfv.m_pf_coil_structure[k]:.2e}\t{pfv.b_pf_coil_peak[k]:.2e}\t", ) # Central Solenoid, if present diff --git a/process/power.py b/process/power.py index d900e5c800..5de87e0033 100644 --- a/process/power.py +++ b/process/power.py @@ -120,7 +120,7 @@ def pfpwr(self, output: bool): * np.pi * pfcoil_variables.r_pf_coil_middle[ic] * abs( - pfcoil_variables.rjconpf[ic] + pfcoil_variables.j_pf_coil_wp_peak[ic] / ( (1.0e0 - pfcoil_variables.vf[ic]) * 1.0e6 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index cb11429ba1..355a737590 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -295,7 +295,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) coreradiationfraction, fimp use numerics, only: factor, boundl, minmax, neqns, nvar, epsfcn, ixc, & epsvmc, ftol, ipnvars, ioptimz, nineqns, ipeqns, boundu, icc, ipnfoms, name_xc - use pfcoil_variables, only: rhopfbus, rjconpf, zref, fcuohsu, f_a_cs_steel, vf, & + use pfcoil_variables, only: rhopfbus, j_pf_coil_wp_peak, zref, fcuohsu, f_a_cs_steel, vf, & j_cs_flat_top_end, sigpfcalw, alstroh, i_pf_conductor, fcupfsu, fvssu, etapsu, i_cs_stress, & fb_cs_limit_max, ngc, rpf2, fcohbop, f_z_cs_tf_internal, vfohc, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & n_pf_coil_groups, i_pf_superconductor, nfxfh, alfapf, routr, sigpfcf, rho_pf_coil, b_cs_limit_max, & @@ -1885,8 +1885,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('rho_pf_coil') call parse_real_variable('rho_pf_coil', rho_pf_coil, 0.0D0, 1.0D-4, & 'PF coil resistivity (ohm-m)') - case ('rjconpf') - call parse_real_array('rjconpf', rjconpf, isub1, ngc2, & + case ('j_pf_coil_wp_peak') + call parse_real_array('j_pf_coil_wp_peak', j_pf_coil_wp_peak, isub1, ngc2, & 'Average J of PF coil (A/m2)', icode) case ('routr') call parse_real_variable('routr', routr, -3.0D0, 3.0D0, & diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index efebc1405a..58d74581b9 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -258,7 +258,7 @@ module pfcoil_variables real(dp), dimension(ngc2) :: c_pf_cs_coils_peak_ma !! peak current in coil i (MA-turns) - real(dp), dimension(ngc2) :: rjconpf + real(dp), dimension(ngc2) :: j_pf_coil_wp_peak !! average winding pack current density of PF coil i (A/m2) at time of peak !! current in that coil (calculated for `i_pf_location=1` coils) @@ -475,7 +475,7 @@ subroutine init_pfcoil_variables r_pf_coil_inner = 0.0D0 r_pf_coil_outer = 0.0D0 c_pf_cs_coils_peak_ma = 0.0D0 - rjconpf = (/3.0D7, 3.0D7, 3.0D7, & + j_pf_coil_wp_peak = (/3.0D7, 3.0D7, 3.0D7, & 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, & 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, & 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7/) diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 29e1320f56..d06026068a 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -1745,7 +1745,7 @@ n_pf_coil_groups = 4 f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 9928f2114e..b35d39dda0 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -1746,7 +1746,7 @@ n_pf_coil_groups = 4 f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index e43d2e4bb4..c2e5442020 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -1746,7 +1746,7 @@ n_pf_coil_groups = 4 f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 752fa735d5..d08764380e 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -1746,7 +1746,7 @@ n_pf_coil_groups = 4 f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 1396d761a9..a37099c04f 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -556,7 +556,7 @@ n_pf_coil_groups = 4 f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 1ca1eae2b7..0191e6e3e9 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -1747,7 +1747,7 @@ n_pf_coil_groups = 4 f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index fe69de55df..2ace33ea33 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -290,7 +290,7 @@ n_pf_coils_in_group = 1,1,2,2 * number of PF coils in group j n_pf_coil_groups = 4 * number of groups of PF coils; Symmetric coil pairs should all be in the same group f_z_cs_tf_internal = 0.9 * Central solenoid height / TF coil internal height f_a_cs_steel = 0.4856940627014451 * central solenoid steel fraction (`iteration variable 122`) -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * average winding pack current density of PF coil i (A/m2) at time of peak +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * average winding pack current density of PF coil i (A/m2) at time of peak rpf2 = -1.825 * offset (m) of radial position of `i_pf_location=2` PF coils from being at sigpfcf = 0.666 * fraction of JxB hoop force supported by steel case for superconducting PF coils (`ipfres=0`) zref(1) = 3.6 diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 70419fb450..f5c6d4a771 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -231,7 +231,7 @@ i_pf_superconductor = 3 * Switch for superconductor material in pf coils; n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j n_pf_coil_groups = 4 * Number of groups of pf coils; f_z_cs_tf_internal = 0.9 * Central solenoid height / tf coil internal height -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils zref(1) = 3.6 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 7acdcd35c0..d6a679a7ec 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -18033,7 +18033,7 @@ n_pf_coil_groups = 4 f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 644708fbfc..a0e0602a42 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -9210,7 +9210,7 @@ i_pf_superconductor = 3 * Switch for superconductor material in pf coils; n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j n_pf_coil_groups = 4 * Number of groups of pf coils; f_z_cs_tf_internal = 0.9 * Central solenoid height / tf coil internal height -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils zref(1) = 3.6 diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 7eb9fe68da..8b9d3a8544 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -231,7 +231,7 @@ i_pf_superconductor = 3 * Switch for superconductor material in pf coils; n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j n_pf_coil_groups = 4 * Number of groups of pf coils; f_z_cs_tf_internal = 0.9 * Central solenoid height / tf coil internal height -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils zref(1) = 3.6 diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index c28b85b623..cebf61f092 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -231,7 +231,7 @@ i_pf_superconductor = 3 * Switch for superconductor material in pf coils; n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j n_pf_coil_groups = 4 * Number of groups of pf coils; f_z_cs_tf_internal = 0.9 * Central solenoid height / tf coil internal height -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6, * Average winding pack current density of pf coil i (a/m2) rpf2 = -1.825 * Offset (m) of radial position of i_pf_location=2 pf coils zref(1) = 3.6 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index c1b56a907c..186c2ddbe8 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -4226,7 +4226,7 @@ "ripmax": 1.0, "ripple": 0.0, "c_tf_total": 0.0, - "rjconpf": 30000000.0, + "j_pf_coil_wp_peak": 30000000.0, "rjohc": 0.0, "rjohc0": 0.0, "j_pf_wp_critical": 0.0, @@ -10533,7 +10533,7 @@ "ripmax": "aximum allowable toroidal field ripple amplitude at plasma edge (%)", "ripple": "peak/average toroidal field ripple at plasma edge (%)", "c_tf_total": "total (summed) current in TF coils (A)", - "rjconpf": "average winding pack current density of PF coil i (A/m2) at time of peak\n current in that coil (calculated for `i_pf_location=1` coils)", + "j_pf_coil_wp_peak": "average winding pack current density of PF coil i (A/m2) at time of peak\n current in that coil (calculated for `i_pf_location=1` coils)", "rjohc": "allowable central solenoid current density at end of flat-top (A/m2)", "rjohc0": "allowable central solenoid current density at beginning of pulse (A/m2)", "j_pf_wp_critical": "allowable winding pack current density of PF coil i (A/m2)", @@ -18976,7 +18976,7 @@ "r_pf_coil_inner", "r_pf_coil_outer", "c_pf_cs_coils_peak_ma", - "rjconpf", + "j_pf_coil_wp_peak", "rjohc", "rjohc0", "j_pf_wp_critical", @@ -20662,7 +20662,7 @@ "rho_tf_bus": "real_variable", "rinboard": "real_variable", "ripmax": "real_variable", - "rjconpf": "real_array", + "j_pf_coil_wp_peak": "real_array", "rlenmax": "real_variable", "ind_plasma_internal_norm": "real_variable", "rmajor": "real_variable", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 6478d7fde1..195ba86db8 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -62,7 +62,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "n_cs_pf_coils", 0) monkeypatch.setattr(pfv, "r_pf_coil_outer_max", 0.0) monkeypatch.setattr(pfv, "fcohbop", 1.0) - monkeypatch.setattr(pfv, "rjconpf", np.full(22, 1.1e7)) + monkeypatch.setattr(pfv, "j_pf_coil_wp_peak", np.full(22, 1.1e7)) monkeypatch.setattr(pfv, "n_pf_coil_groups", 4) monkeypatch.setattr(pfv, "r_cs_middle", 3.0) monkeypatch.setattr( diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index b64bf19bfe..4cacca413f 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -556,7 +556,7 @@ n_pf_coil_groups = 4 f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 1f514f14d0..9c9893fccf 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -538,7 +538,7 @@ n_pf_coil_groups = 4 f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index 57b8c80b24..8f8097db93 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -290,7 +290,7 @@ n_pf_coils_in_group = 1,1,2,2 * number of PF coils in group j n_pf_coil_groups = 4 * number of groups of PF coils; Symmetric coil pairs should all be in the same group f_z_cs_tf_internal = 0.9 * Central solenoid height / TF coil internal height f_a_cs_steel = 0.4856940627014451 * central solenoid steel fraction (`iteration variable 122`) -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * average winding pack current density of PF coil i (A/m2) at time of peak +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * average winding pack current density of PF coil i (A/m2) at time of peak rpf2 = -1.825 * offset (m) of radial position of `i_pf_location=2` PF coils from being at sigpfcf = 0.666 * fraction of JxB hoop force supported by steel case for superconducting PF coils (`i_pf_conductor=0`) zref(1) = 3.6 diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 1a0ccb01c3..b444578b41 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1956,7 +1956,7 @@ zref(4) = 5.2 * JUSTIFICATION: Position coils inside and in the middle of TF coil *c_pf_coil_turn_peak_input: Current per turn for PF coil -*rjconpf: Current per turn for PF coil resistivity (ohm-m) +*j_pf_coil_wp_peak: Current per turn for PF coil resistivity (ohm-m) *rref: Radius of i_pf_location = 4 coil groups. Number of minor radii from major radius *zref: Height of i_pf_location 3/4 coil groups. Units of minor radius diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 139a15a132..6155868eb8 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -557,7 +557,7 @@ n_pf_coil_groups = 4 f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 567100717f..7eaf227dda 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -1748,7 +1748,7 @@ n_pf_coil_groups = 4 f_z_cs_tf_internal = 0.9 * Average winding pack current density of PF coil i [A/m2] -rjconpf = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 +j_pf_coil_wp_peak = 1.1d7, 1.1d7, 6.d6, 6.d6, 8.d6, 8.0d6, 8.0d6, 8.0d6 * Offset of radial position of i_pf_location=2 pf coils [m] rpf2 = -1.825 diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 05bb27390c..20d2610a23 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -2018,7 +2018,7 @@ class Acc2222Param(NamedTuple): fkind: Any = None - rjconpf: Any = None + j_pf_coil_wp_peak: Any = None supercond_cost_model: Any = None @@ -2096,7 +2096,7 @@ class Acc2222Param(NamedTuple): ucwindpf=465, lsa=2, fkind=1, - rjconpf=np.array( + j_pf_coil_wp_peak=np.array( np.array( ( 11000000, @@ -2292,7 +2292,7 @@ class Acc2222Param(NamedTuple): ucwindpf=465, lsa=2, fkind=1, - rjconpf=np.array( + j_pf_coil_wp_peak=np.array( np.array( ( 11000000, @@ -2488,7 +2488,7 @@ class Acc2222Param(NamedTuple): ucwindpf=465, lsa=2, fkind=1, - rjconpf=np.array( + j_pf_coil_wp_peak=np.array( np.array( ( 11000000, @@ -2705,7 +2705,9 @@ def test_acc2222(acc2222param, monkeypatch, costs): monkeypatch.setattr(cost_variables, "fkind", acc2222param.fkind) - monkeypatch.setattr(pfcoil_variables, "rjconpf", acc2222param.rjconpf) + monkeypatch.setattr( + pfcoil_variables, "j_pf_coil_wp_peak", acc2222param.j_pf_coil_wp_peak + ) monkeypatch.setattr( cost_variables, "supercond_cost_model", acc2222param.supercond_cost_model diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index e1fcca2b3a..3a73e0b12d 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -217,7 +217,7 @@ class PfpwrParam(NamedTuple): vf: Any = None - rjconpf: Any = None + j_pf_coil_wp_peak: Any = None r_pf_coil_middle: Any = None @@ -798,7 +798,7 @@ class PfpwrParam(NamedTuple): ), order="F", ).transpose(), - rjconpf=np.array( + j_pf_coil_wp_peak=np.array( np.array( ( 11000000, @@ -1541,7 +1541,7 @@ class PfpwrParam(NamedTuple): ), order="F", ).transpose(), - rjconpf=np.array( + j_pf_coil_wp_peak=np.array( np.array( ( 11000000, @@ -1840,7 +1840,9 @@ def test_pfpwr(pfpwrparam, monkeypatch, power): monkeypatch.setattr(pfcoil_variables, "vf", pfpwrparam.vf) - monkeypatch.setattr(pfcoil_variables, "rjconpf", pfpwrparam.rjconpf) + monkeypatch.setattr( + pfcoil_variables, "j_pf_coil_wp_peak", pfpwrparam.j_pf_coil_wp_peak + ) monkeypatch.setattr( pfcoil_variables, "r_pf_coil_middle", pfpwrparam.r_pf_coil_middle From f0369ff7ad099199a31d25f9fdb9bfc4929c1673 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 10:04:59 +0000 Subject: [PATCH 46/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'powohres'=20to?= =?UTF-8?q?=20'p=5Fcs=5Fresistive=5Fflat=5Ftop'=20for=20clarity=20and=20co?= =?UTF-8?q?nsistency=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 8 ++++---- process/pulse.py | 2 +- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/integration/test_pfcoil_int.py | 2 +- tests/unit/test_pulse.py | 10 ++++++---- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index 96ab2d9528..d76710bc99 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1308,7 +1308,7 @@ def ohcalc(self): else: # Resistive power losses (non-superconducting coil) - pfv.powohres = ( + pfv.p_cs_resistive_flat_top = ( 2.0e0 * constants.pi * pfv.r_cs_middle @@ -1316,7 +1316,7 @@ def ohcalc(self): / (pfv.a_cs_poloidal * (1.0e0 - pfv.vfohc)) * (1.0e6 * pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1]) ** 2 ) - pfv.powpfres = pfv.powpfres + pfv.powohres + pfv.powpfres = pfv.powpfres + pfv.p_cs_resistive_flat_top def peakb(self, i, ii, it): """Calculates the peak field at a PF coil. @@ -2470,8 +2470,8 @@ def outpf(self): op.ovarre( self.outfile, "Central solenoid resistive power (W)", - "(powohres)", - pfv.powohres, + "(p_cs_resistive_flat_top)", + pfv.p_cs_resistive_flat_top, "OP ", ) diff --git a/process/pulse.py b/process/pulse.py index 4078bdcf65..595efcdd99 100644 --- a/process/pulse.py +++ b/process/pulse.py @@ -63,7 +63,7 @@ def tohswg(self, output: bool) -> None: r = 0.0e0 else: r = ( - pfcoil_variables.powohres + pfcoil_variables.p_cs_resistive_flat_top / ( 1.0e6 * pfcoil_variables.c_pf_cs_coils_peak_ma[ diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 58d74581b9..02add80d47 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -243,7 +243,7 @@ module pfcoil_variables real(dp) :: pfwpmw !! Total mean wall plug power dissipated in PFC and CS power supplies (MW) (issue #713) - real(dp) :: powohres + real(dp) :: p_cs_resistive_flat_top !! central solenoid resistive power during flattop (W) real(dp) :: powpfres @@ -470,7 +470,7 @@ subroutine init_pfcoil_variables pfmmax = 0.0D0 r_pf_coil_outer_max = 0.0D0 pfwpmw = 0.0D0 - powohres = 0.0D0 + p_cs_resistive_flat_top = 0.0D0 powpfres = 0.0D0 r_pf_coil_inner = 0.0D0 r_pf_coil_outer = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 186c2ddbe8..9324d97472 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3598,7 +3598,7 @@ "p_plasma_loss_mw": 0.0, "powfmax": 1500.0, "fusion_power": 0.0, - "powohres": 0.0, + "p_cs_resistive_flat_top": 0.0, "powpfres": 0.0, "ppdivr": 0.0, "len_plasma_poloidal": 0.0, @@ -10350,7 +10350,7 @@ "p_plasma_loss_mw": "heating power (= transport loss power) (MW) used in confinement time calculation", "powfmax": "maximum fusion power (MW) (`constraint equation 9`)", "fusion_power": "fusion power (MW)", - "powohres": "central solenoid resistive power during flattop (W)", + "p_cs_resistive_flat_top": "central solenoid resistive power during flattop (W)", "powpfres": "total PF coil resistive losses during flattop (W)", "ppdivr": "peak heat load at plate (with radiation) (MW/m2)", "len_plasma_poloidal": "plasma poloidal perimeter (m)", @@ -18971,7 +18971,7 @@ "pfmmax", "r_pf_coil_outer_max", "pfwpmw", - "powohres", + "p_cs_resistive_flat_top", "powpfres", "r_pf_coil_inner", "r_pf_coil_outer", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 195ba86db8..73aa54bed1 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -204,7 +204,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "a_cs_poloidal", 1.039e1) monkeypatch.setattr(pfv, "powpfres", 0.0) monkeypatch.setattr(pfv, "jcableoh_eof", 1.427e8) - monkeypatch.setattr(pfv, "powohres", 0.0) + monkeypatch.setattr(pfv, "p_cs_resistive_flat_top", 0.0) monkeypatch.setattr(pfv, "rjohc0", 3.048e7) monkeypatch.setattr(pfv, "s_tresca_oh", 5.718e8) monkeypatch.setattr(pfv, "awpoh", 4.232) diff --git a/tests/unit/test_pulse.py b/tests/unit/test_pulse.py index 216adce0e9..3b0589954c 100644 --- a/tests/unit/test_pulse.py +++ b/tests/unit/test_pulse.py @@ -36,7 +36,7 @@ class TohswgParam(NamedTuple): n_cs_pf_coils: Any = None - powohres: Any = None + p_cs_resistive_flat_top: Any = None ind_pf_cs_plasma_mutual: Any = None @@ -102,7 +102,7 @@ class BurnParam(NamedTuple): n_pf_cs_plasma_circuits=8, i_pf_conductor=0, n_cs_pf_coils=7, - powohres=0, + p_cs_resistive_flat_top=0, ind_pf_cs_plasma_mutual=np.array( ( ( @@ -660,7 +660,7 @@ class BurnParam(NamedTuple): n_pf_cs_plasma_circuits=8, i_pf_conductor=0, n_cs_pf_coils=7, - powohres=0, + p_cs_resistive_flat_top=0, ind_pf_cs_plasma_mutual=np.array( ( ( @@ -1241,7 +1241,9 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): monkeypatch.setattr(pfcoil_variables, "n_cs_pf_coils", tohswgparam.n_cs_pf_coils) - monkeypatch.setattr(pfcoil_variables, "powohres", tohswgparam.powohres) + monkeypatch.setattr( + pfcoil_variables, "p_cs_resistive_flat_top", tohswgparam.p_cs_resistive_flat_top + ) monkeypatch.setattr( pfcoil_variables, "ind_pf_cs_plasma_mutual", tohswgparam.ind_pf_cs_plasma_mutual From 1c6ec95fea4b41a497576c125fa00cea34b0fe3a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 10:09:18 +0000 Subject: [PATCH 47/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'rjohc'=20to=20'j?= =?UTF-8?q?=5Fcs=5Fcritical=5Fflat=5Ftop=5Fend'=20for=20clarity=20and=20co?= =?UTF-8?q?nsistency=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/pfcoil.py | 8 ++--- source/fortran/constraint_equations.f90 | 12 ++++---- source/fortran/pfcoil_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/integration/test_pfcoil_int.py | 4 +-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- 19 files changed, 61 insertions(+), 61 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index df5e269c98..a95e67a837 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -782,7 +782,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3221E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 4.2900E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.2870E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 4.2063E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 4.2063E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0066E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0588E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.5551E-01 ITV diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index c3bacc41f4..908535d9a7 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -777,7 +777,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6485E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index ce89e4564f..f84f00bf69 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -777,7 +777,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6485E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 04c5a34568..7f9c69302f 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -777,7 +777,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6485E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index ab171c2570..a49b7f4eb5 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -777,7 +777,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6485E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 13c67f07ed..70fd797e0b 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -625,7 +625,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 @@ -1620,7 +1620,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 @@ -2615,7 +2615,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 @@ -3610,7 +3610,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 @@ -4605,7 +4605,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 @@ -5600,7 +5600,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 @@ -6595,7 +6595,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 @@ -7590,7 +7590,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 @@ -8585,7 +8585,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 diff --git a/process/pfcoil.py b/process/pfcoil.py index d76710bc99..39036443bf 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1280,7 +1280,7 @@ def ohcalc(self): else: pfv.j_crit_str_cs = pfv.jscoh_eof * (1 - pfv.fcuohsu) - pfv.rjohc = jcritwp * pfv.awpoh / pfv.a_cs_poloidal + pfv.j_cs_critical_flat_top_end = jcritwp * pfv.awpoh / pfv.a_cs_poloidal # Allowable coil overall current density at BOP @@ -2110,8 +2110,8 @@ def outpf(self): op.ovarre( self.outfile, "Allowable overall current density at EOF (A/m2)", - "(rjohc)", - pfv.rjohc, + "(j_cs_critical_flat_top_end)", + pfv.j_cs_critical_flat_top_end, "OP ", ) op.ovarre( @@ -2353,7 +2353,7 @@ def outpf(self): # iteration variable(38) fjohc if ( abs(pfv.j_cs_flat_top_end) - > 0.99e0 * abs(numerics.boundu[37] * pfv.rjohc) + > 0.99e0 * abs(numerics.boundu[37] * pfv.j_cs_critical_flat_top_end) ) or ( abs(pfv.j_cs_pulse_start) > 0.99e0 * abs(numerics.boundu[38] * pfv.rjohc0) diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 98822d0156..01c8bad8b0 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -1352,14 +1352,14 @@ subroutine constraint_eqn_026(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! residual error in physical units; output string; units string !! Equation for Central Solenoid current density upper limit at EOF !! #=# pfcoil - !! #=#=# fjohc, rjohc + !! #=#=# fjohc, j_cs_critical_flat_top_end !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! fjohc : input real : f-value for central solenoid current at end-of-flattop - !! rjohc : input real : allowable central solenoid current density at end of flat-top (A/m2) + !! j_cs_critical_flat_top_end : input real : allowable central solenoid current density at end of flat-top (A/m2) !! j_cs_flat_top_end : input real : central solenoid overall current density at end of flat-top (A/m2) use constraint_variables, only: fjohc - use pfcoil_variables, only: rjohc, j_cs_flat_top_end + use pfcoil_variables, only: j_cs_critical_flat_top_end, j_cs_flat_top_end implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -1367,9 +1367,9 @@ subroutine constraint_eqn_026(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 - fjohc * rjohc/j_cs_flat_top_end - tmp_con = rjohc - tmp_err = rjohc - j_cs_flat_top_end / fjohc + tmp_cc = 1.0D0 - fjohc * j_cs_critical_flat_top_end/j_cs_flat_top_end + tmp_con = j_cs_critical_flat_top_end + tmp_err = j_cs_critical_flat_top_end - j_cs_flat_top_end / fjohc tmp_symbol = '<' tmp_units = 'A/m2' diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 02add80d47..2c6094e26e 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -262,7 +262,7 @@ module pfcoil_variables !! average winding pack current density of PF coil i (A/m2) at time of peak !! current in that coil (calculated for `i_pf_location=1` coils) - real(dp) :: rjohc + real(dp) :: j_cs_critical_flat_top_end !! allowable central solenoid current density at end of flat-top (A/m2) real(dp) :: rjohc0 @@ -479,7 +479,7 @@ subroutine init_pfcoil_variables 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, & 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, & 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7/) - rjohc = 0.0D0 + j_cs_critical_flat_top_end = 0.0D0 rjohc0 = 0.0D0 j_pf_wp_critical = 0.0D0 r_cs_middle = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index d06026068a..910e4fc579 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -776,7 +776,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6485E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index b35d39dda0..2b068f7626 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -777,7 +777,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6485E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index c2e5442020..5e3dc72ed0 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -777,7 +777,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6485E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index d08764380e..eb1b4f95c6 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -777,7 +777,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6485E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6485E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 0191e6e3e9..cde97f4a1d 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -780,7 +780,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3907E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6220E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0866E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6495E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6495E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0188E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9704E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7696E-01 ITV diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index d6a679a7ec..63d5881313 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -778,7 +778,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4055E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.4875E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0463E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7086E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7086E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1229E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0486E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.5540E-01 ITV @@ -1941,7 +1941,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4012E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5259E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0578E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7235E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7235E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1286E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0684E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.5277E-01 ITV @@ -3104,7 +3104,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3990E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5459E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0638E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7334E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7334E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1239E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0815E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.5352E-01 ITV @@ -4267,7 +4267,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3987E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5486E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0646E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7341E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7341E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1225E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0802E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.5349E-01 ITV @@ -5430,7 +5430,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4030E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5102E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0531E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7118E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7118E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1309E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0685E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.5266E-01 ITV @@ -6593,7 +6593,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4019E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5201E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0560E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7309E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7309E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1525E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0572E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4639E-01 ITV @@ -7756,7 +7756,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4010E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5281E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0584E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7359E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7359E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1559E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0569E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4494E-01 ITV @@ -8919,7 +8919,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4004E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5337E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0601E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7320E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7320E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1509E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0708E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4622E-01 ITV @@ -10082,7 +10082,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3999E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5380E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0614E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7257E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7257E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1466E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0841E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4724E-01 ITV @@ -11245,7 +11245,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3998E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5386E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0616E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7254E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7254E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1461E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0834E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4720E-01 ITV @@ -12408,7 +12408,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4002E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5351E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0605E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7316E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7316E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1474E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0691E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4697E-01 ITV @@ -13571,7 +13571,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3982E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5531E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0659E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7526E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7526E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1499E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0559E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4537E-01 ITV @@ -14734,7 +14734,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3980E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5550E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0665E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7533E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7533E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1490E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0549E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4535E-01 ITV @@ -15897,7 +15897,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3986E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5498E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0649E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7403E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7403E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1459E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0688E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4673E-01 ITV @@ -17060,7 +17060,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3987E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5491E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0647E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.7308E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7308E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1426E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 2.0828E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.4798E-01 ITV diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index a0e0602a42..26a4d89f19 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -625,7 +625,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 @@ -1620,7 +1620,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 @@ -2615,7 +2615,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 @@ -3610,7 +3610,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 @@ -4605,7 +4605,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 @@ -5600,7 +5600,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 @@ -6595,7 +6595,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 @@ -7590,7 +7590,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 @@ -8585,7 +8585,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 1.1397E+08 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore.)_______________________ 2.2626E+00 CS_thickness_(m)________________________________________________________ (dr_cs.)______________________ 7.0754E-01 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 9324d97472..75c1aab92e 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -4227,7 +4227,7 @@ "ripple": 0.0, "c_tf_total": 0.0, "j_pf_coil_wp_peak": 30000000.0, - "rjohc": 0.0, + "j_cs_critical_flat_top_end": 0.0, "rjohc0": 0.0, "j_pf_wp_critical": 0.0, "rkind": "double", @@ -10534,7 +10534,7 @@ "ripple": "peak/average toroidal field ripple at plasma edge (%)", "c_tf_total": "total (summed) current in TF coils (A)", "j_pf_coil_wp_peak": "average winding pack current density of PF coil i (A/m2) at time of peak\n current in that coil (calculated for `i_pf_location=1` coils)", - "rjohc": "allowable central solenoid current density at end of flat-top (A/m2)", + "j_cs_critical_flat_top_end": "allowable central solenoid current density at end of flat-top (A/m2)", "rjohc0": "allowable central solenoid current density at beginning of pulse (A/m2)", "j_pf_wp_critical": "allowable winding pack current density of PF coil i (A/m2)", "rkind": "", @@ -18977,7 +18977,7 @@ "r_pf_coil_outer", "c_pf_cs_coils_peak_ma", "j_pf_coil_wp_peak", - "rjohc", + "j_cs_critical_flat_top_end", "rjohc0", "j_pf_wp_critical", "r_cs_middle", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 73aa54bed1..a34b42bd84 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -210,7 +210,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "awpoh", 4.232) monkeypatch.setattr(pfv, "f_a_cs_steel", 5.926e-1) monkeypatch.setattr(pfv, "b_cs_peak_pulse_start", 1.4e1) - monkeypatch.setattr(pfv, "rjohc", 4.070e7) + monkeypatch.setattr(pfv, "j_cs_critical_flat_top_end", 4.070e7) monkeypatch.setattr(pfv, "temp_cs_margin", 1.5) monkeypatch.setattr(pfv, "i_pf_conductor", 0) monkeypatch.setattr(pfv, "j_pf_wp_critical", np.full(22, 0.0)) @@ -271,7 +271,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): pfcoil.ohcalc() assert pytest.approx(pfv.b_pf_coil_peak[4]) == 13.073958753751993 - assert pytest.approx(pfv.rjohc) == 54101481.7685945 + assert pytest.approx(pfv.j_cs_critical_flat_top_end) == 54101481.7685945 def test_efc(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 7eaf227dda..520fa0b508 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -780,7 +780,7 @@ Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3907E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6220E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0866E+08 OP - Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (rjohc)_______________________ 3.6495E+07 OP + Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6495E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0188E+07 ITV CS_inside_radius_(m)____________________________________________________ (dr_bore)________________________ 1.9704E+00 ITV CS_thickness_(m)________________________________________________________ (dr_cs)_______________________ 5.7696E-01 ITV From 6e625b423d2338ca2f1d76b22646f55292229e06 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 10:10:45 +0000 Subject: [PATCH 48/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20rjohc0=20to=20j?= =?UTF-8?q?=5Fcs=5Fcritical=5Fpulse=5Fstart=20for=20clarity=20and=20consis?= =?UTF-8?q?tency=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/pfcoil.py | 8 ++--- source/fortran/constraint_equations.f90 | 12 ++++---- source/fortran/pfcoil_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/integration/test_pfcoil_int.py | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- 19 files changed, 60 insertions(+), 60 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index a95e67a837..0ea288b033 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -777,7 +777,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3997E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5395E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0618E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.4704E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.4704E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9770E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3221E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 4.2900E+08 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 908535d9a7..016f2fd462 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -772,7 +772,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index f84f00bf69..f06c3e1134 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -772,7 +772,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 7f9c69302f..5119f1709a 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -772,7 +772,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index a49b7f4eb5..36116795ac 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -772,7 +772,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 70fd797e0b..262a3b2ebe 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -620,7 +620,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP @@ -1615,7 +1615,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP @@ -2610,7 +2610,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP @@ -3605,7 +3605,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP @@ -4600,7 +4600,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP @@ -5595,7 +5595,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP @@ -6590,7 +6590,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP @@ -7585,7 +7585,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP @@ -8580,7 +8580,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP diff --git a/process/pfcoil.py b/process/pfcoil.py index 39036443bf..0f2920db87 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1301,7 +1301,7 @@ def ohcalc(self): pfv.j_pf_wp_critical[pfv.n_cs_pf_coils - 1] = ( jcritwp * pfv.awpoh / pfv.a_cs_poloidal ) - pfv.rjohc0 = pfv.j_pf_wp_critical[pfv.n_cs_pf_coils - 1] + pfv.j_cs_critical_pulse_start = pfv.j_pf_wp_critical[pfv.n_cs_pf_coils - 1] pfv.temp_cs_margin = min(tmarg1, tmarg2) @@ -2074,8 +2074,8 @@ def outpf(self): op.ovarre( self.outfile, "Allowable overall current density at BOP (A/m2)", - "(rjohc0)", - pfv.rjohc0, + "(j_cs_critical_pulse_start)", + pfv.j_cs_critical_pulse_start, "OP ", ) op.ovarre( @@ -2356,7 +2356,7 @@ def outpf(self): > 0.99e0 * abs(numerics.boundu[37] * pfv.j_cs_critical_flat_top_end) ) or ( abs(pfv.j_cs_pulse_start) - > 0.99e0 * abs(numerics.boundu[38] * pfv.rjohc0) + > 0.99e0 * abs(numerics.boundu[38] * pfv.j_cs_critical_pulse_start) ): pf.cslimit = True if pfv.temp_cs_margin < 1.01e0 * tfv.tmargmin_cs: diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 01c8bad8b0..428d9a4498 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -1382,14 +1382,14 @@ subroutine constraint_eqn_027(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! residual error in physical units; output string; units string !! Equation for Central Solenoid current density upper limit at BOP !! #=# pfcoil - !! #=#=# fjohc0, rjohc0 + !! #=#=# fjohc0, j_cs_critical_pulse_start !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! fjohc0 : input real : f-value for central solenoid current at beginning of pulse - !! rjohc0 : input real : allowable central solenoid current density at beginning of pulse (A/m2) + !! j_cs_critical_pulse_start : input real : allowable central solenoid current density at beginning of pulse (A/m2) !! j_cs_pulse_start : input real : central solenoid overall current density at beginning of pulse (A/m2) use constraint_variables, only: fjohc0 - use pfcoil_variables, only: rjohc0, j_cs_pulse_start + use pfcoil_variables, only: j_cs_critical_pulse_start, j_cs_pulse_start implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -1397,9 +1397,9 @@ subroutine constraint_eqn_027(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 - fjohc0 * rjohc0/j_cs_pulse_start - tmp_con = rjohc0 - tmp_err = rjohc0 - j_cs_pulse_start / fjohc0 + tmp_cc = 1.0D0 - fjohc0 * j_cs_critical_pulse_start/j_cs_pulse_start + tmp_con = j_cs_critical_pulse_start + tmp_err = j_cs_critical_pulse_start - j_cs_pulse_start / fjohc0 tmp_symbol = '<' tmp_units = 'A/m2' diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 2c6094e26e..0c4771b75a 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -265,7 +265,7 @@ module pfcoil_variables real(dp) :: j_cs_critical_flat_top_end !! allowable central solenoid current density at end of flat-top (A/m2) - real(dp) :: rjohc0 + real(dp) :: j_cs_critical_pulse_start !! allowable central solenoid current density at beginning of pulse (A/m2) real(dp), dimension(ngc2) :: j_pf_wp_critical @@ -480,7 +480,7 @@ subroutine init_pfcoil_variables 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7, & 3.0D7, 3.0D7, 3.0D7, 3.0D7, 3.0D7/) j_cs_critical_flat_top_end = 0.0D0 - rjohc0 = 0.0D0 + j_cs_critical_pulse_start = 0.0D0 j_pf_wp_critical = 0.0D0 r_cs_middle = 0.0D0 routr = 1.5D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 910e4fc579..b69ab8728e 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -771,7 +771,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 2b068f7626..65eadbe5ce 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -772,7 +772,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 5e3dc72ed0..479c6a14b0 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -772,7 +772,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index eb1b4f95c6..ef65303841 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -772,7 +772,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5294E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index cde97f4a1d..0127bb83a7 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -775,7 +775,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4055E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4872E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0462E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5137E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5137E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9094E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3907E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6220E+08 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 63d5881313..592b90e857 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -773,7 +773,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4070E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4743E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0423E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.6946E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.6946E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9874E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4055E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.4875E+08 OP @@ -1936,7 +1936,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4035E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5050E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0515E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7013E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7013E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9925E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4012E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5259E+08 OP @@ -3099,7 +3099,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4029E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5107E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0532E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.6963E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.6963E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9893E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3990E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5459E+08 OP @@ -4262,7 +4262,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4028E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5119E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0536E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.6955E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.6955E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9892E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3987E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5486E+08 OP @@ -5425,7 +5425,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4026E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5139E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0542E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7157E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7157E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9915E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4030E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5102E+08 OP @@ -6588,7 +6588,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3979E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5564E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0669E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7694E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7694E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0074E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4019E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5201E+08 OP @@ -7751,7 +7751,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3965E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5690E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0707E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7792E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7792E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0108E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4010E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5281E+08 OP @@ -8914,7 +8914,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3964E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5698E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0709E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7701E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7701E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0063E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4004E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5337E+08 OP @@ -10077,7 +10077,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3954E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5786E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0736E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7684E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7684E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0015E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3999E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5380E+08 OP @@ -11240,7 +11240,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3952E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5809E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0743E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7698E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7698E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0013E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3998E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5386E+08 OP @@ -12403,7 +12403,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3979E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5563E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0669E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7541E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7541E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0056E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4002E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5351E+08 OP @@ -13566,7 +13566,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3997E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5397E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0619E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7385E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7385E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0138E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3982E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5531E+08 OP @@ -14729,7 +14729,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3996E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5406E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0622E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7380E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7380E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0137E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3980E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5550E+08 OP @@ -15892,7 +15892,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3991E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5452E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0636E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7355E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7355E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0082E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3986E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5498E+08 OP @@ -17055,7 +17055,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3986E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5494E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0648E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.7312E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7312E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0034E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3987E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5491E+08 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 26a4d89f19..1c3a2f3be6 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -620,7 +620,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP @@ -1615,7 +1615,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP @@ -2610,7 +2610,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP @@ -3605,7 +3605,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP @@ -4600,7 +4600,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP @@ -5595,7 +5595,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP @@ -6590,7 +6590,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP @@ -7585,7 +7585,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP @@ -8580,7 +8580,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 9.2008E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 75c1aab92e..b525bd19fe 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -4228,7 +4228,7 @@ "c_tf_total": 0.0, "j_pf_coil_wp_peak": 30000000.0, "j_cs_critical_flat_top_end": 0.0, - "rjohc0": 0.0, + "j_cs_critical_pulse_start": 0.0, "j_pf_wp_critical": 0.0, "rkind": "double", "rlclolcn": 0.0, @@ -10535,7 +10535,7 @@ "c_tf_total": "total (summed) current in TF coils (A)", "j_pf_coil_wp_peak": "average winding pack current density of PF coil i (A/m2) at time of peak\n current in that coil (calculated for `i_pf_location=1` coils)", "j_cs_critical_flat_top_end": "allowable central solenoid current density at end of flat-top (A/m2)", - "rjohc0": "allowable central solenoid current density at beginning of pulse (A/m2)", + "j_cs_critical_pulse_start": "allowable central solenoid current density at beginning of pulse (A/m2)", "j_pf_wp_critical": "allowable winding pack current density of PF coil i (A/m2)", "rkind": "", "rlclolcn": "ratio of collision length / connection length", @@ -18978,7 +18978,7 @@ "c_pf_cs_coils_peak_ma", "j_pf_coil_wp_peak", "j_cs_critical_flat_top_end", - "rjohc0", + "j_cs_critical_pulse_start", "j_pf_wp_critical", "r_cs_middle", "routr", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index a34b42bd84..90d032b61c 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -205,7 +205,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "powpfres", 0.0) monkeypatch.setattr(pfv, "jcableoh_eof", 1.427e8) monkeypatch.setattr(pfv, "p_cs_resistive_flat_top", 0.0) - monkeypatch.setattr(pfv, "rjohc0", 3.048e7) + monkeypatch.setattr(pfv, "j_cs_critical_pulse_start", 3.048e7) monkeypatch.setattr(pfv, "s_tresca_oh", 5.718e8) monkeypatch.setattr(pfv, "awpoh", 4.232) monkeypatch.setattr(pfv, "f_a_cs_steel", 5.926e-1) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 520fa0b508..bea45c3e52 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -775,7 +775,7 @@ Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4055E+01 OP Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4872E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0462E+08 OP - Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (rjohc0)______________________ 3.5137E+07 OP + Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5137E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9094E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3907E+01 OP Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6220E+08 OP From 10c8de5d1a5648ec1d9cd012d630f740cbb6e0c8 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 10:15:52 +0000 Subject: [PATCH 49/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'pfmmax'=20to=20'?= =?UTF-8?q?m=5Fpf=5Fcoil=5Fmax'=20for=20clarity=20and=20consistency=20acro?= =?UTF-8?q?ss=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/buildings.py | 2 +- process/pfcoil.py | 6 +++--- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/integration/test_pfcoil_int.py | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/process/buildings.py b/process/buildings.py index b212009ac7..c7f2df7cfb 100644 --- a/process/buildings.py +++ b/process/buildings.py @@ -75,7 +75,7 @@ def run(self, output: bool = False): ) = self.bldgs( output, pfcoil_variables.r_pf_coil_outer_max, - pfcoil_variables.pfmmax, + pfcoil_variables.m_pf_coil_max, tfro, tfri, tf_vertical_dim, diff --git a/process/pfcoil.py b/process/pfcoil.py index 0f2920db87..dd21b0238e 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -628,7 +628,7 @@ def pfcoil(self): i = 0 it = 0 pfv.powpfres = 0.0e0 - pfv.pfmmax = 0.0e0 + pfv.m_pf_coil_max = 0.0e0 for ii in range(pfv.n_pf_coil_groups): iii = ii @@ -762,8 +762,8 @@ def pfcoil(self): # Mass of heaviest PF coil (tonnes) - pfv.pfmmax = max( - pfv.pfmmax, + pfv.m_pf_coil_max = max( + pfv.m_pf_coil_max, ( 1.0e-3 * (pfv.m_pf_coil_conductor[i] + pfv.m_pf_coil_structure[i]) diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 0c4771b75a..3aef58bb74 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -234,7 +234,7 @@ module pfcoil_variables !! Resistivity of CS and PF coil bus bars (irrespective of !! whether the coils themselves are superconducting or resistive) (Ohm-m) - real(dp) :: pfmmax + real(dp) :: m_pf_coil_max !! mass of heaviest PF coil (tonnes) real(dp) :: r_pf_coil_outer_max @@ -467,7 +467,7 @@ subroutine init_pfcoil_variables pfcaseth = 0.0D0 rho_pf_coil = 2.5D-8 rhopfbus = 3.93D-8 - pfmmax = 0.0D0 + m_pf_coil_max = 0.0D0 r_pf_coil_outer_max = 0.0D0 pfwpmw = 0.0D0 p_cs_resistive_flat_top = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index b525bd19fe..d6639aec2d 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3508,7 +3508,7 @@ "pfcaseth": 0.0, "pfckts": 0.0, "rho_pf_coil": 2.5e-08, - "pfmmax": 0.0, + "m_pf_coil_max": 0.0, "r_pf_coil_outer_max": 0.0, "charged_particle_power": 0.0, "pfusife": 1000.0, @@ -10266,7 +10266,7 @@ "pfcaseth": "steel case thickness for PF coil i (m)", "pfckts": "number of PF coil circuits", "rho_pf_coil": "PF coil resistivity (if i_pf_conductor=1) (Ohm-m)", - "pfmmax": "mass of heaviest PF coil (tonnes)", + "m_pf_coil_max": "mass of heaviest PF coil (tonnes)", "r_pf_coil_outer_max": "radius of largest PF coil (m)", "charged_particle_power": "charged particle fusion power (MW)", "pfusife": "IFE input fusion power (MW) (`ifedrv=3 only`; `itv 155`)", @@ -18968,7 +18968,7 @@ "f_a_cs_steel", "pfcaseth", "rho_pf_coil", - "pfmmax", + "m_pf_coil_max", "r_pf_coil_outer_max", "pfwpmw", "p_cs_resistive_flat_top", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 90d032b61c..5b02dba544 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -91,7 +91,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "c_pf_cs_coil_pulse_end_ma", np.full(22, 0.0)) monkeypatch.setattr(pfv, "r_pf_coil_middle", np.full(22, 0.0)) monkeypatch.setattr(pfv, "zref", [3.6, 1.2, 2.5, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0]) - monkeypatch.setattr(pfv, "pfmmax", 0.0) + monkeypatch.setattr(pfv, "m_pf_coil_max", 0.0) monkeypatch.setattr(pfv, "i_pf_conductor", 0) monkeypatch.setattr(pfv, "alfapf", 5.0e-10) monkeypatch.setattr(pfv, "n_pf_cs_plasma_circuits", 8) From eb3b1130f6334a62dd6bfd29c521e7190e8740dd Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 10:26:15 +0000 Subject: [PATCH 50/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20jscoh=5Fbop=20to?= =?UTF-8?q?=20j=5Fcs=5Fconductor=5Fcritical=5Fpulse=5Fstart=20for=20clarit?= =?UTF-8?q?y=20and=20consistency=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/pfcoil.py | 11 +++++-- source/fortran/pfcoil_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/integration/test_pfcoil_int.py | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- 18 files changed, 58 insertions(+), 53 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 0ea288b033..a30a546181 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -775,7 +775,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3997E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5395E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.5395E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0618E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.4704E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9770E+07 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 016f2fd462..55a9947d77 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -770,7 +770,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index f06c3e1134..841df00b6a 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -770,7 +770,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 5119f1709a..f260184b91 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -770,7 +770,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 36116795ac..891062136c 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -770,7 +770,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 262a3b2ebe..288f1bebe2 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -618,7 +618,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP @@ -1613,7 +1613,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP @@ -2608,7 +2608,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP @@ -3603,7 +3603,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP @@ -4598,7 +4598,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP @@ -5593,7 +5593,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP @@ -6588,7 +6588,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP @@ -7583,7 +7583,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP @@ -8578,7 +8578,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 6.6143E+08 OP Critical_strand_current_density_at_BOP_(A/m2)___________________________ (jstrandoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP diff --git a/process/pfcoil.py b/process/pfcoil.py index dd21b0238e..80923c5080 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1284,7 +1284,12 @@ def ohcalc(self): # Allowable coil overall current density at BOP - jcritwp, pfv.jcableoh_bop, pfv.jscoh_bop, tmarg2 = self.superconpf( + + jcritwp, + pfv.jcableoh_bop, + pfv.j_cs_conductor_critical_pulse_start, + tmarg2, + = self.superconpf( pfv.b_cs_peak_pulse_start, pfv.vfohc, pfv.fcuohsu, @@ -2060,8 +2065,8 @@ def outpf(self): op.ovarre( self.outfile, "Critical superconductor current density at BOP (A/m2)", - "(jscoh_bop)", - pfv.jscoh_bop, + "(j_cs_conductor_critical_pulse_start)", + pfv.j_cs_conductor_critical_pulse_start, "OP ", ) op.ovarre( diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 3aef58bb74..cf521e1771 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -186,7 +186,7 @@ module pfcoil_variables !! - =1 Outboard PF coils all have same radius, cylindrical !! winding surface - real(dp) :: jscoh_bop + real(dp) :: j_cs_conductor_critical_pulse_start !! central solenoid superconductor critical current density (A/m2) at beginning-of-pulse real(dp) :: jscoh_eof @@ -452,7 +452,7 @@ subroutine init_pfcoil_variables j_crit_str_pf = 0.0D0 i_pf_current = 1 i_sup_pf_shape = 0 - jscoh_bop = 0.0D0 + j_cs_conductor_critical_pulse_start = 0.0D0 jscoh_eof = 0.0D0 jcableoh_bop = 0.0D0 jcableoh_eof = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index b69ab8728e..422598bf09 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -769,7 +769,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 65eadbe5ce..8ccfdae943 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -770,7 +770,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 479c6a14b0..2578e68963 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -770,7 +770,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index ef65303841..f44eeb35b5 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -770,7 +770,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4050E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4918E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.4918E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0475E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 0127bb83a7..ca180c9b79 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -773,7 +773,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4055E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4872E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.4872E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0462E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5137E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9094E+07 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 592b90e857..58b8291b98 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -771,7 +771,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4070E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4743E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.4743E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0423E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.6946E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9874E+07 OP @@ -1934,7 +1934,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4035E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5050E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.5050E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0515E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7013E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9925E+07 OP @@ -3097,7 +3097,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4029E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5107E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.5107E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0532E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.6963E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9893E+07 OP @@ -4260,7 +4260,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4028E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5119E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.5119E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0536E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.6955E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9892E+07 OP @@ -5423,7 +5423,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4026E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5139E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.5139E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0542E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7157E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9915E+07 OP @@ -6586,7 +6586,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3979E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5564E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.5564E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0669E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7694E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0074E+07 OP @@ -7749,7 +7749,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3965E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5690E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.5690E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0707E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7792E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0108E+07 OP @@ -8912,7 +8912,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3964E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5698E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.5698E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0709E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7701E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0063E+07 OP @@ -10075,7 +10075,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3954E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5786E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.5786E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0736E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7684E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0015E+07 OP @@ -11238,7 +11238,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3952E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5809E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.5809E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0743E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7698E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0013E+07 OP @@ -12401,7 +12401,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3979E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5563E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.5563E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0669E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7541E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0056E+07 OP @@ -13564,7 +13564,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3997E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5397E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.5397E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0619E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7385E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0138E+07 OP @@ -14727,7 +14727,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3996E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5406E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.5406E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0622E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7380E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0137E+07 OP @@ -15890,7 +15890,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3991E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5452E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.5452E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0636E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7355E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0082E+07 OP @@ -17053,7 +17053,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.3986E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.5494E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.5494E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0648E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7312E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0034E+07 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 1c3a2f3be6..19a1d7fb56 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -618,7 +618,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP @@ -1613,7 +1613,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP @@ -2608,7 +2608,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP @@ -3603,7 +3603,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP @@ -4598,7 +4598,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP @@ -5593,7 +5593,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP @@ -6588,7 +6588,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP @@ -7583,7 +7583,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP @@ -8578,7 +8578,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 5 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.1499E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 6.6143E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 6.6143E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.9843E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index d6639aec2d..437872965c 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2867,7 +2867,7 @@ "j_plus_ob": 0.686, "jacket": null, "j_tf_bus": 1250000.0, - "jscoh_bop": 0.0, + "j_cs_conductor_critical_pulse_start": 0.0, "jscoh_eof": 0.0, "jcableoh_bop": 0.0, "jcableoh_eof": 0.0, @@ -9928,7 +9928,7 @@ "j_plus_ob": "", "jacket": "", "j_tf_bus": "bussing current density (A/m2)", - "jscoh_bop": "central solenoid superconductor critical current density (A/m2) at beginning-of-pulse", + "j_cs_conductor_critical_pulse_start": "central solenoid superconductor critical current density (A/m2) at beginning-of-pulse", "jscoh_eof": "central solenoid superconductor critical current density (A/m2) at end-of-flattop", "jcableoh_bop": "central solenoid cable critical current density (A/m2) at beginning-of-pulse", "jcableoh_eof": "central solenoid cable critical current density (A/m2) at end-of-flattop", @@ -18955,7 +18955,7 @@ "i_pf_superconductor", "i_pf_current", "i_sup_pf_shape", - "jscoh_bop", + "j_cs_conductor_critical_pulse_start", "jscoh_eof", "jcableoh_bop", "jcableoh_eof", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 5b02dba544..c299211c94 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -222,7 +222,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "z_pf_coil_middle", np.full(22, 0.0)) monkeypatch.setattr(pfv, "r_pf_coil_outer", np.full(22, 0.0)) monkeypatch.setattr(pfv, "r_pf_coil_inner", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "jscoh_bop", 3.562e8) + monkeypatch.setattr(pfv, "j_cs_conductor_critical_pulse_start", 3.562e8) monkeypatch.setattr(pfv, "c_pf_coil_turn_peak_input", np.full(22, 4.22e4)) monkeypatch.setattr(pfv, "pfcaseth", np.full(22, 0.0)) monkeypatch.setattr(pfv, "r_pf_coil_middle", np.full(22, 0.0)) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index bea45c3e52..c0a6236e6f 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -773,7 +773,7 @@ # Central Solenoid and PF Coils # Central_solenoid_superconductor_material________________________________ (i_cs_superconductor)____________________ 1 Maximum_field_at_Beginning_Of_Pulse_(T)_________________________________ (b_cs_peak_pulse_start)_____________________ 1.4055E+01 OP - Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (jscoh_bop)___________________ 3.4872E+08 OP + Critical_superconductor_current_density_at_BOP_(A/m2)___________________ (j_cs_conductor_critical_pulse_start)___________________ 3.4872E+08 OP Critical_cable_current_density_at_BOP_(A/m2)___________________________ (jcableoh_bop)_______________ 1.0462E+08 OP Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5137E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9094E+07 OP From 2a6f6ed59b9da2043438819ac59252fc1be0bad5 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 10:28:07 +0000 Subject: [PATCH 51/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20jscoh=5Feof=20to?= =?UTF-8?q?=20j=5Fcs=5Fconductor=5Fcritical=5Fflat=5Ftop=5Fend=20for=20cla?= =?UTF-8?q?rity=20and=20consistency=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/pfcoil.py | 17 +++++++---- source/fortran/pfcoil_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/integration/test_pfcoil_int.py | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- 18 files changed, 62 insertions(+), 55 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index a30a546181..e1a8fa5a2d 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -780,7 +780,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.4704E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9770E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3221E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 4.2900E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 4.2900E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.2870E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 4.2063E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0066E+07 ITV diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 55a9947d77..5f3fa158ec 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -775,7 +775,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6485E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 841df00b6a..c9167392e0 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -775,7 +775,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6485E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index f260184b91..c95c3b36aa 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -775,7 +775,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6485E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 891062136c..db0e1b5e59 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -775,7 +775,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6485E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 288f1bebe2..4c42308ef1 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -623,7 +623,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV @@ -1618,7 +1618,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV @@ -2613,7 +2613,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV @@ -3608,7 +3608,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV @@ -4603,7 +4603,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV @@ -5598,7 +5598,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV @@ -6593,7 +6593,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV @@ -7588,7 +7588,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV @@ -8583,7 +8583,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 8.1933E+08 OP Critical_strand_current_density_at_EOF_(A/m2)___________________________ (jstrandoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV diff --git a/process/pfcoil.py b/process/pfcoil.py index 80923c5080..964a393196 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1260,7 +1260,12 @@ def ohcalc(self): # Allowable coil overall current density at EOF # (superconducting coils only) - jcritwp, pfv.jcableoh_eof, pfv.jscoh_eof, tmarg1 = self.superconpf( + + jcritwp, + pfv.jcableoh_eof, + pfv.j_cs_conductor_critical_flat_top_end, + tmarg1, + = self.superconpf( pfv.b_cs_peak_flat_top_end, pfv.vfohc, pfv.fcuohsu, @@ -1276,9 +1281,11 @@ def ohcalc(self): # Strand critical current calculation for costing in $/kAm # = superconducting filaments jc * (1 - strand copper fraction) if pfv.i_cs_superconductor.item() in {2, 6, 8}: - pfv.j_crit_str_cs = pfv.jscoh_eof + pfv.j_crit_str_cs = pfv.j_cs_conductor_critical_flat_top_end else: - pfv.j_crit_str_cs = pfv.jscoh_eof * (1 - pfv.fcuohsu) + pfv.j_crit_str_cs = pfv.j_cs_conductor_critical_flat_top_end * ( + 1 - pfv.fcuohsu + ) pfv.j_cs_critical_flat_top_end = jcritwp * pfv.awpoh / pfv.a_cs_poloidal @@ -2101,8 +2108,8 @@ def outpf(self): op.ovarre( self.outfile, "Critical superconductor current density at EOF (A/m2)", - "(jscoh_eof)", - pfv.jscoh_eof, + "(j_cs_conductor_critical_flat_top_end)", + pfv.j_cs_conductor_critical_flat_top_end, "OP ", ) op.ovarre( diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index cf521e1771..b883c48940 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -189,7 +189,7 @@ module pfcoil_variables real(dp) :: j_cs_conductor_critical_pulse_start !! central solenoid superconductor critical current density (A/m2) at beginning-of-pulse - real(dp) :: jscoh_eof + real(dp) :: j_cs_conductor_critical_flat_top_end !! central solenoid superconductor critical current density (A/m2) at end-of-flattop real(dp) :: jcableoh_bop @@ -453,7 +453,7 @@ subroutine init_pfcoil_variables i_pf_current = 1 i_sup_pf_shape = 0 j_cs_conductor_critical_pulse_start = 0.0D0 - jscoh_eof = 0.0D0 + j_cs_conductor_critical_flat_top_end = 0.0D0 jcableoh_bop = 0.0D0 jcableoh_eof = 0.0D0 n_pf_cs_plasma_circuits = 0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 422598bf09..36c2a15b7c 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -774,7 +774,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6485E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 8ccfdae943..46138cc045 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -775,7 +775,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6485E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 2578e68963..54247f0d89 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -775,7 +775,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6485E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index f44eeb35b5..c4d7513a37 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -775,7 +775,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5294E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9126E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3920E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6097E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.6097E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0829E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6485E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0264E+07 ITV diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index ca180c9b79..460732d148 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -778,7 +778,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5137E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9094E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3907E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6220E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.6220E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0866E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6495E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0188E+07 ITV diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 58b8291b98..0abb5889d8 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -776,7 +776,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.6946E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9874E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4055E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.4875E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.4875E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0463E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7086E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1229E+07 ITV @@ -1939,7 +1939,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7013E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9925E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4012E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5259E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.5259E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0578E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7235E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1286E+07 ITV @@ -3102,7 +3102,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.6963E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9893E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3990E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5459E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.5459E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0638E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7334E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1239E+07 ITV @@ -4265,7 +4265,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.6955E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9892E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3987E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5486E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.5486E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0646E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7341E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1225E+07 ITV @@ -5428,7 +5428,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7157E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9915E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4030E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5102E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.5102E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0531E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7118E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1309E+07 ITV @@ -6591,7 +6591,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7694E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0074E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4019E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5201E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.5201E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0560E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7309E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1525E+07 ITV @@ -7754,7 +7754,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7792E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0108E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4010E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5281E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.5281E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0584E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7359E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1559E+07 ITV @@ -8917,7 +8917,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7701E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0063E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4004E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5337E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.5337E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0601E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7320E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1509E+07 ITV @@ -10080,7 +10080,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7684E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0015E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3999E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5380E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.5380E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0614E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7257E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1466E+07 ITV @@ -11243,7 +11243,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7698E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0013E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3998E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5386E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.5386E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0616E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7254E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1461E+07 ITV @@ -12406,7 +12406,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7541E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0056E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.4002E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5351E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.5351E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0605E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7316E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1474E+07 ITV @@ -13569,7 +13569,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7385E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0138E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3982E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5531E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.5531E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0659E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7526E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1499E+07 ITV @@ -14732,7 +14732,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7380E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0137E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3980E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5550E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.5550E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0665E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7533E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1490E+07 ITV @@ -15895,7 +15895,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7355E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0082E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3986E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5498E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.5498E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0649E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7403E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1459E+07 ITV @@ -17058,7 +17058,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.7312E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 2.0034E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3987E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.5491E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.5491E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0647E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.7308E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.1426E+07 ITV diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 19a1d7fb56..22354cdcfb 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -623,7 +623,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV @@ -1618,7 +1618,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV @@ -2613,7 +2613,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV @@ -3608,7 +3608,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV @@ -4603,7 +4603,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV @@ -5598,7 +5598,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV @@ -6593,7 +6593,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV @@ -7588,7 +7588,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV @@ -8583,7 +8583,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 9.2008E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.2788E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.0525E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 8.1933E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 8.1933E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 2.4580E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 1.1397E+08 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 1.2788E+07 ITV diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 437872965c..ac26225838 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2868,7 +2868,7 @@ "jacket": null, "j_tf_bus": 1250000.0, "j_cs_conductor_critical_pulse_start": 0.0, - "jscoh_eof": 0.0, + "j_cs_conductor_critical_flat_top_end": 0.0, "jcableoh_bop": 0.0, "jcableoh_eof": 0.0, "jwdgcrt": 0.0, @@ -9929,7 +9929,7 @@ "jacket": "", "j_tf_bus": "bussing current density (A/m2)", "j_cs_conductor_critical_pulse_start": "central solenoid superconductor critical current density (A/m2) at beginning-of-pulse", - "jscoh_eof": "central solenoid superconductor critical current density (A/m2) at end-of-flattop", + "j_cs_conductor_critical_flat_top_end": "central solenoid superconductor critical current density (A/m2) at end-of-flattop", "jcableoh_bop": "central solenoid cable critical current density (A/m2) at beginning-of-pulse", "jcableoh_eof": "central solenoid cable critical current density (A/m2) at end-of-flattop", "jwdgcrt": "critical current density for winding pack (A/m2)", @@ -18956,7 +18956,7 @@ "i_pf_current", "i_sup_pf_shape", "j_cs_conductor_critical_pulse_start", - "jscoh_eof", + "j_cs_conductor_critical_flat_top_end", "jcableoh_bop", "jcableoh_eof", "n_pf_cs_plasma_circuits", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index c299211c94..24add4c37d 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -218,7 +218,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "vf", np.full(22, 0.3)) monkeypatch.setattr(pfv, "c_pf_cs_coils_peak_ma", np.full(22, 0.0)) monkeypatch.setattr(pfv, "b_pf_coil_peak", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "jscoh_eof", 4.758e8) + monkeypatch.setattr(pfv, "j_cs_conductor_critical_flat_top_end", 4.758e8) monkeypatch.setattr(pfv, "z_pf_coil_middle", np.full(22, 0.0)) monkeypatch.setattr(pfv, "r_pf_coil_outer", np.full(22, 0.0)) monkeypatch.setattr(pfv, "r_pf_coil_inner", np.full(22, 0.0)) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index c0a6236e6f..5612b3d171 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -778,7 +778,7 @@ Allowable_overall_current_density_at_BOP_(A/m2)_________________________ (j_cs_critical_pulse_start)______________________ 3.5137E+07 OP Actual_overall_current_density_at_BOP_(A/m2)____________________________ (j_cs_pulse_start)______________________ 1.9094E+07 OP Maximum_field_at_End_Of_Flattop_(T)_____________________________________ (b_cs_peak_flat_top_end)______________________ 1.3907E+01 OP - Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (jscoh_eof)___________________ 3.6220E+08 OP + Critical_superconductor_current_density_at_EOF_(A/m2)___________________ (j_cs_conductor_critical_flat_top_end)___________________ 3.6220E+08 OP Critical_cable_current_density_at_EOF_(A/m2)___________________________ (jcableoh_eof)_______________ 1.0866E+08 OP Allowable_overall_current_density_at_EOF_(A/m2)_________________________ (j_cs_critical_flat_top_end)_______________________ 3.6495E+07 OP Actual_overall_current_density_at_EOF_(A/m2)____________________________ (j_cs_flat_top_end)______________________ 2.0188E+07 ITV From e6e0820a60ef5dc4cec981b87f061b9978e2a2b2 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 10:30:08 +0000 Subject: [PATCH 52/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20powpfres=20to=20p?= =?UTF-8?q?=5Fpf=5Fcoil=5Fresistive=5Ftotal=5Fflat=5Ftop=20for=20clarity?= =?UTF-8?q?=20and=20consistency=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 14 ++++++++------ source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/integration/test_pfcoil_int.py | 4 ++-- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index 964a393196..9de2f7513d 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -627,7 +627,7 @@ def pfcoil(self): # power losses and volumes and weights for each PF coil, index i i = 0 it = 0 - pfv.powpfres = 0.0e0 + pfv.p_pf_coil_resistive_total_flat_top = 0.0e0 pfv.m_pf_coil_max = 0.0e0 for ii in range(pfv.n_pf_coil_groups): @@ -684,8 +684,8 @@ def pfcoil(self): # Sum resistive power losses - pfv.powpfres = ( - pfv.powpfres + pfv.p_pf_coil_resistive_total_flat_top = ( + pfv.p_pf_coil_resistive_total_flat_top + respf * ( 1.0e6 @@ -1328,7 +1328,9 @@ def ohcalc(self): / (pfv.a_cs_poloidal * (1.0e0 - pfv.vfohc)) * (1.0e6 * pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1]) ** 2 ) - pfv.powpfres = pfv.powpfres + pfv.p_cs_resistive_flat_top + pfv.p_pf_coil_resistive_total_flat_top = ( + pfv.p_pf_coil_resistive_total_flat_top + pfv.p_cs_resistive_flat_top + ) def peakb(self, i, ii, it): """Calculates the peak field at a PF coil. @@ -2474,8 +2476,8 @@ def outpf(self): op.ovarre( self.outfile, "PF coil resistive power (W)", - "(powpfres)", - pfv.powpfres, + "(p_pf_coil_resistive_total_flat_top)", + pfv.p_pf_coil_resistive_total_flat_top, "OP ", ) if bv.iohcl != 0: diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index b883c48940..8e18628b39 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -246,7 +246,7 @@ module pfcoil_variables real(dp) :: p_cs_resistive_flat_top !! central solenoid resistive power during flattop (W) - real(dp) :: powpfres + real(dp) :: p_pf_coil_resistive_total_flat_top !! total PF coil resistive losses during flattop (W) real(dp), dimension(ngc2) :: r_pf_coil_inner @@ -471,7 +471,7 @@ subroutine init_pfcoil_variables r_pf_coil_outer_max = 0.0D0 pfwpmw = 0.0D0 p_cs_resistive_flat_top = 0.0D0 - powpfres = 0.0D0 + p_pf_coil_resistive_total_flat_top = 0.0D0 r_pf_coil_inner = 0.0D0 r_pf_coil_outer = 0.0D0 c_pf_cs_coils_peak_ma = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index ac26225838..6c01584faa 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3599,7 +3599,7 @@ "powfmax": 1500.0, "fusion_power": 0.0, "p_cs_resistive_flat_top": 0.0, - "powpfres": 0.0, + "p_pf_coil_resistive_total_flat_top": 0.0, "ppdivr": 0.0, "len_plasma_poloidal": 0.0, "ppump": 0.0, @@ -10351,7 +10351,7 @@ "powfmax": "maximum fusion power (MW) (`constraint equation 9`)", "fusion_power": "fusion power (MW)", "p_cs_resistive_flat_top": "central solenoid resistive power during flattop (W)", - "powpfres": "total PF coil resistive losses during flattop (W)", + "p_pf_coil_resistive_total_flat_top": "total PF coil resistive losses during flattop (W)", "ppdivr": "peak heat load at plate (with radiation) (MW/m2)", "len_plasma_poloidal": "plasma poloidal perimeter (m)", "ppump": "centrepost coolant pump power (W)", @@ -18972,7 +18972,7 @@ "r_pf_coil_outer_max", "pfwpmw", "p_cs_resistive_flat_top", - "powpfres", + "p_pf_coil_resistive_total_flat_top", "r_pf_coil_inner", "r_pf_coil_outer", "c_pf_cs_coils_peak_ma", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 24add4c37d..3e49ee0efe 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -76,7 +76,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "f_z_cs_tf_internal", 9.0e-1) monkeypatch.setattr(pfv, "i_pf_location", np.array([2, 2, 3, 3, 0, 0, 0, 0, 0, 0])) monkeypatch.setattr(pfv, "m_pf_coil_structure", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "powpfres", 0.0) + monkeypatch.setattr(pfv, "p_pf_coil_resistive_total_flat_top", 0.0) monkeypatch.setattr(pfv, "c_pf_cs_coil_pulse_start_ma", np.full(22, 0.0)) monkeypatch.setattr(pfv, "routr", 1.5) monkeypatch.setattr(pfv, "c_pf_cs_coils_peak_ma", np.full(22, 0.0)) @@ -202,7 +202,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "i_cs_superconductor", 5) monkeypatch.setattr(pfv, "f_z_cs_tf_internal", 0.9) monkeypatch.setattr(pfv, "a_cs_poloidal", 1.039e1) - monkeypatch.setattr(pfv, "powpfres", 0.0) + monkeypatch.setattr(pfv, "p_pf_coil_resistive_total_flat_top", 0.0) monkeypatch.setattr(pfv, "jcableoh_eof", 1.427e8) monkeypatch.setattr(pfv, "p_cs_resistive_flat_top", 0.0) monkeypatch.setattr(pfv, "j_cs_critical_pulse_start", 3.048e7) From f7fe0fcc01df37149f415b88022e1ee0fcf0df9f Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 10:35:41 +0000 Subject: [PATCH 53/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'vf'=20to=20'f=5F?= =?UTF-8?q?a=5Fpf=5Fcoil=5Fvoid'=20for=20clarity=20and=20consistency=20acr?= =?UTF-8?q?oss=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- documentation/proc-pages/eng-models/pf-coil.md | 2 +- process/costs.py | 6 +++--- process/pfcoil.py | 18 +++++++++++------- process/power.py | 2 +- source/fortran/input.f90 | 6 +++--- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- tests/integration/test_pfcoil_int.py | 4 ++-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_costs_1990.py | 12 +++++++----- tests/unit/test_power.py | 10 ++++++---- 11 files changed, 41 insertions(+), 33 deletions(-) diff --git a/documentation/proc-pages/eng-models/pf-coil.md b/documentation/proc-pages/eng-models/pf-coil.md index 2243c70c84..7ae1e6afb5 100644 --- a/documentation/proc-pages/eng-models/pf-coil.md +++ b/documentation/proc-pages/eng-models/pf-coil.md @@ -39,7 +39,7 @@ into account `i_single_null` and other recent changes e.g. rclsnorm) *R* = `rtot` + `dr_tf_outboard`/2 + `routr`
                        *Z* = $\pm$(`rminor` * `zref(j)` -The void fraction (for coolant) in each coil `i`'s winding pack is given by `vf(i)`. +The void fraction (for coolant) in each coil `i`'s winding pack is given by `f_a_pf_coil_void(i)`. ## Coil currents diff --git a/process/costs.py b/process/costs.py index fa607c4886..0a8b5c7518 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1587,7 +1587,7 @@ def acc2222(self): costpfsc = ( cost_variables.ucsc[pfcoil_variables.i_pf_superconductor - 1] * (1.0e0 - pfcoil_variables.fcupfsu) - * (1.0e0 - pfcoil_variables.vf[i]) + * (1.0e0 - pfcoil_variables.f_a_pf_coil_void[i]) * abs( pfcoil_variables.c_pf_cs_coils_peak_ma[i] / pfcoil_variables.n_pf_coil_turns[i] @@ -1619,7 +1619,7 @@ def acc2222(self): costpfcu = ( cost_variables.uccu * pfcoil_variables.fcupfsu - * (1.0e0 - pfcoil_variables.vf[i]) + * (1.0e0 - pfcoil_variables.f_a_pf_coil_void[i]) * abs( pfcoil_variables.c_pf_cs_coils_peak_ma[i] / pfcoil_variables.n_pf_coil_turns[i] @@ -1631,7 +1631,7 @@ def acc2222(self): else: costpfcu = ( cost_variables.uccu - * (1.0e0 - pfcoil_variables.vf[i]) + * (1.0e0 - pfcoil_variables.f_a_pf_coil_void[i]) * abs( pfcoil_variables.c_pf_cs_coils_peak_ma[i] / pfcoil_variables.n_pf_coil_turns[i] diff --git a/process/pfcoil.py b/process/pfcoil.py index 9de2f7513d..74ec2675c4 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -648,7 +648,7 @@ def pfcoil(self): pfv.j_pf_wp_critical[i], jstrand, jsc, tmarg = self.superconpf( bmax, - pfv.vf[i], + pfv.f_a_pf_coil_void[i], pfv.fcupfsu, pfv.j_pf_coil_wp_peak[i], pfv.i_pf_superconductor, @@ -678,9 +678,13 @@ def pfcoil(self): # Resistive coils if pfv.i_pf_conductor == 1: - # Coil resistance (vf is the void fraction) + # Coil resistance (f_a_pf_coil_void is the void fraction) - respf = pfv.rho_pf_coil * rll / (aturn[i] * (1.0e0 - pfv.vf[i])) + respf = ( + pfv.rho_pf_coil + * rll + / (aturn[i] * (1.0e0 - pfv.f_a_pf_coil_void[i])) + ) # Sum resistive power losses @@ -699,17 +703,17 @@ def pfcoil(self): volpf = aturn[i] * rll - # Conductor weight (vf is the void fraction) + # Conductor weight (f_a_pf_coil_void is the void fraction) if pfv.i_pf_conductor == 0: pfv.m_pf_coil_conductor[i] = ( volpf * tfv.dcond[pfv.i_pf_superconductor - 1] - * (1.0e0 - pfv.vf[i]) + * (1.0e0 - pfv.f_a_pf_coil_void[i]) ) else: pfv.m_pf_coil_conductor[i] = ( - volpf * constants.dcopper * (1.0e0 - pfv.vf[i]) + volpf * constants.dcopper * (1.0e0 - pfv.f_a_pf_coil_void[i]) ) # (J x B) force on coil @@ -1122,7 +1126,7 @@ def ohcalc(self): csfv.t_structural_radial = 1.0e-3 # Non-steel area void fraction for coolant - pfv.vf[pfv.n_cs_pf_coils - 1] = pfv.vfohc + pfv.f_a_pf_coil_void[pfv.n_cs_pf_coils - 1] = pfv.vfohc # Peak field at the End-Of-Flattop (EOF) # Occurs at inner edge of coil; bmaxoh2 and bzi are of opposite sign at EOF diff --git a/process/power.py b/process/power.py index 5de87e0033..1be7434c42 100644 --- a/process/power.py +++ b/process/power.py @@ -122,7 +122,7 @@ def pfpwr(self, output: bool): * abs( pfcoil_variables.j_pf_coil_wp_peak[ic] / ( - (1.0e0 - pfcoil_variables.vf[ic]) + (1.0e0 - pfcoil_variables.f_a_pf_coil_void[ic]) * 1.0e6 * pfcoil_variables.c_pf_cs_coils_peak_ma[ic] ) diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 355a737590..ba50278160 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -295,7 +295,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) coreradiationfraction, fimp use numerics, only: factor, boundl, minmax, neqns, nvar, epsfcn, ixc, & epsvmc, ftol, ipnvars, ioptimz, nineqns, ipeqns, boundu, icc, ipnfoms, name_xc - use pfcoil_variables, only: rhopfbus, j_pf_coil_wp_peak, zref, fcuohsu, f_a_cs_steel, vf, & + use pfcoil_variables, only: rhopfbus, j_pf_coil_wp_peak, zref, fcuohsu, f_a_cs_steel, f_a_pf_coil_void, & j_cs_flat_top_end, sigpfcalw, alstroh, i_pf_conductor, fcupfsu, fvssu, etapsu, i_cs_stress, & fb_cs_limit_max, ngc, rpf2, fcohbop, f_z_cs_tf_internal, vfohc, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & n_pf_coil_groups, i_pf_superconductor, nfxfh, alfapf, routr, sigpfcf, rho_pf_coil, b_cs_limit_max, & @@ -1912,8 +1912,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('sigpfcf') call parse_real_variable('sigpfcf', sigpfcf, 0.1D0, 1.0D0, & 'Fraction of JxB force supported by PF coil case') - case ('vf') - call parse_real_array('vf', vf, isub1, ngc2, & + case ('f_a_pf_coil_void') + call parse_real_array('f_a_pf_coil_void', f_a_pf_coil_void, isub1, ngc2, & 'Void fraction of PF coil', icode) case ('vfohc') call parse_real_variable('vfohc', vfohc, 0.0D0, 1.0D0, & diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 8e18628b39..1c0a7cc997 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -317,7 +317,7 @@ module pfcoil_variables real(dp), dimension(ngc2) :: n_pf_coil_turns !! number of turns in PF coil i - real(dp), dimension(ngc2) :: vf + real(dp), dimension(ngc2) :: f_a_pf_coil_void !! winding pack void fraction of PF coil i for coolant real(dp) :: vfohc @@ -495,7 +495,7 @@ subroutine init_pfcoil_variables ind_pf_cs_plasma_mutual = 0.0D0 temp_cs_margin = 0.0D0 n_pf_coil_turns = 0.0D0 - vf = 0.3D0 + f_a_pf_coil_void = 0.3D0 vfohc = 0.3D0 vsbn = 0.0D0 vsefbn = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 6c01584faa..85373c566f 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7907,7 +7907,7 @@ "velblkti": 0.0, "velblkto": 0.0, "verbose": 0.0, - "vf": 0.3, + "f_a_pf_coil_void": 0.3, "vfblkt": 0.25, "vfblkti": null, "vfblkto": null, @@ -11016,7 +11016,7 @@ "velblkti": "Inboard/outboard coolant velocity in blanket (m/s)", "velblkto": "Inboard/outboard coolant velocity in blanket (m/s)", "verbose": "switch for turning on/off diagnostic messages\n
                          \n
                        • =0 turn off diagnostics
                          • \n
                        • =1 turn on diagnostics
                          • \n
                        ", - "vf": "winding pack void fraction of PF coil i for coolant", + "f_a_pf_coil_void": "winding pack void fraction of PF coil i for coolant", "vfblkt": "coolant void fraction in blanket (`blktmodel=0`), (calculated if `blktmodel > 0`)", "vfblkti": "Inboard/outboard void fraction of blanket", "vfblkto": "Inboard/outboard void fraction of blanket", @@ -18992,7 +18992,7 @@ "ind_pf_cs_plasma_mutual", "temp_cs_margin", "turns", - "vf", + "f_a_pf_coil_void", "vfohc", "vsbn", "vsefbn", @@ -20874,7 +20874,7 @@ "vcool": "real_variable", "vdalw": "real_variable", "verbose": "int_variable", - "vf": "real_array", + "f_a_pf_coil_void": "real_array", "vfblkt": "real_variable", "vfcblkt": "real_variable", "vfohc": "real_variable", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 3e49ee0efe..00af64ef18 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -86,7 +86,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "b_pf_coil_peak", np.full(22, 0.0)) monkeypatch.setattr(pfv, "z_pf_coil_lower", np.full(22, 0.0)) monkeypatch.setattr(pfv, "m_pf_coil_conductor", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "vf", np.full(22, 3.0e-1)) + monkeypatch.setattr(pfv, "f_a_pf_coil_void", np.full(22, 3.0e-1)) monkeypatch.setattr(pfv, "n_pf_coil_turns", np.full(22, 0.0)) monkeypatch.setattr(pfv, "c_pf_cs_coil_pulse_end_ma", np.full(22, 0.0)) monkeypatch.setattr(pfv, "r_pf_coil_middle", np.full(22, 0.0)) @@ -215,7 +215,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "i_pf_conductor", 0) monkeypatch.setattr(pfv, "j_pf_wp_critical", np.full(22, 0.0)) monkeypatch.setattr(pfv, "rho_pf_coil", 2.8e-8) - monkeypatch.setattr(pfv, "vf", np.full(22, 0.3)) + monkeypatch.setattr(pfv, "f_a_pf_coil_void", np.full(22, 0.3)) monkeypatch.setattr(pfv, "c_pf_cs_coils_peak_ma", np.full(22, 0.0)) monkeypatch.setattr(pfv, "b_pf_coil_peak", np.full(22, 0.0)) monkeypatch.setattr(pfv, "j_cs_conductor_critical_flat_top_end", 4.758e8) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index b444578b41..60d0cd37c4 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1843,7 +1843,7 @@ i_pf_superconductor = 9 * DESCRIPTION: PF coil resistivity (if i_pf_conductor=1) (Ohm-m) * JUSTIFICATION: Not used, superconducting PF coil -*vf = +*f_a_pf_coil_void = * DESCRIPTION: Winding pack void fraction of PF coil i for coolant (default = 0.3) * JUSTIFICATION: Not yet set diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 20d2610a23..b46fb7df65 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -2048,7 +2048,7 @@ class Acc2222Param(NamedTuple): fcuohsu: Any = None - vf: Any = None + f_a_pf_coil_void: Any = None awpoh: Any = None @@ -2227,7 +2227,7 @@ class Acc2222Param(NamedTuple): i_cs_superconductor=5, fcupfsu=0.68999999999999995, fcuohsu=0.70000000000000007, - vf=np.array( + f_a_pf_coil_void=np.array( np.array( ( 0.29999999999999999, @@ -2423,7 +2423,7 @@ class Acc2222Param(NamedTuple): i_cs_superconductor=5, fcupfsu=0.68999999999999995, fcuohsu=0.70000000000000007, - vf=np.array( + f_a_pf_coil_void=np.array( np.array( ( 0.29999999999999999, @@ -2619,7 +2619,7 @@ class Acc2222Param(NamedTuple): i_cs_superconductor=5, fcupfsu=0.68999999999999995, fcuohsu=0.70000000000000007, - vf=np.array( + f_a_pf_coil_void=np.array( np.array( ( 0.29999999999999999, @@ -2753,7 +2753,9 @@ def test_acc2222(acc2222param, monkeypatch, costs): monkeypatch.setattr(pfcoil_variables, "fcuohsu", acc2222param.fcuohsu) - monkeypatch.setattr(pfcoil_variables, "vf", acc2222param.vf) + monkeypatch.setattr( + pfcoil_variables, "f_a_pf_coil_void", acc2222param.f_a_pf_coil_void + ) monkeypatch.setattr(pfcoil_variables, "awpoh", acc2222param.awpoh) diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 3a73e0b12d..69ecec8d3c 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -215,7 +215,7 @@ class PfpwrParam(NamedTuple): n_pf_coil_turns: Any = None - vf: Any = None + f_a_pf_coil_void: Any = None j_pf_coil_wp_peak: Any = None @@ -768,7 +768,7 @@ class PfpwrParam(NamedTuple): ), order="F", ).transpose(), - vf=np.array( + f_a_pf_coil_void=np.array( np.array( ( 0.29999999999999999, @@ -1511,7 +1511,7 @@ class PfpwrParam(NamedTuple): ), order="F", ).transpose(), - vf=np.array( + f_a_pf_coil_void=np.array( np.array( ( 0.29999999999999999, @@ -1838,7 +1838,9 @@ def test_pfpwr(pfpwrparam, monkeypatch, power): monkeypatch.setattr(pfcoil_variables, "n_pf_coil_turns", pfpwrparam.n_pf_coil_turns) - monkeypatch.setattr(pfcoil_variables, "vf", pfpwrparam.vf) + monkeypatch.setattr( + pfcoil_variables, "f_a_pf_coil_void", pfpwrparam.f_a_pf_coil_void + ) monkeypatch.setattr( pfcoil_variables, "j_pf_coil_wp_peak", pfpwrparam.j_pf_coil_wp_peak From ffe4e925d50d91c8a216d2016a78e5a974fa0920 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 10:37:01 +0000 Subject: [PATCH 54/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'vfohc'=20to=20'f?= =?UTF-8?q?=5Fa=5Fcs=5Fvoid'=20for=20clarity=20and=20consistency=20across?= =?UTF-8?q?=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 6 +- examples/data/large_tokamak_1_MFILE.DAT | 6 +- examples/data/large_tokamak_2_MFILE.DAT | 6 +- examples/data/large_tokamak_3_MFILE.DAT | 6 +- examples/data/large_tokamak_4_MFILE.DAT | 6 +- examples/data/scan_MFILE.DAT | 54 +++++------ process/costs.py | 6 +- process/pfcoil.py | 32 +++---- source/fortran/input.f90 | 6 +- source/fortran/pfcoil_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 6 +- .../data/large_tokamak_2_MFILE.DAT | 6 +- .../data/large_tokamak_3_MFILE.DAT | 6 +- .../data/large_tokamak_4_MFILE.DAT | 6 +- .../integration/data/large_tokamak_MFILE.DAT | 6 +- tests/integration/data/scan_2D_MFILE.DAT | 90 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 54 +++++------ tests/integration/ref_dicts.json | 10 +-- tests/integration/test_pfcoil_int.py | 2 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 6 +- tests/unit/test_costs_1990.py | 10 +-- 22 files changed, 168 insertions(+), 168 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index e1a8fa5a2d..eaf64116d0 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -789,8 +789,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.8176E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.1169E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 2.8819E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.2351E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 2.8819E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.2351E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7006E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.3310E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -801,7 +801,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.5405E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5000E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 5f3fa158ec..05c1c0d799 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -784,8 +784,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1407E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3996E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0797E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3199E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -796,7 +796,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.6256E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5052E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index c9167392e0..32361f69ee 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -784,8 +784,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1407E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3996E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0797E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3199E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -796,7 +796,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.6256E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5052E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index c95c3b36aa..49702e4062 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -784,8 +784,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1407E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3996E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0797E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3199E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -796,7 +796,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.6256E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5052E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index db0e1b5e59..8f560cb8d8 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -784,8 +784,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1407E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3996E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0797E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3199E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -796,7 +796,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.6256E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5052E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 4c42308ef1..1727aa134b 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -632,8 +632,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 5.4592E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -644,7 +644,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.2933E+09 OP Strain_on_CS_superconductor_____________________________________________ (strncon_cs)__________________ -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -1627,8 +1627,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 5.4592E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -1639,7 +1639,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.2933E+09 OP Strain_on_CS_superconductor_____________________________________________ (strncon_cs)__________________ -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -2622,8 +2622,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 5.4592E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -2634,7 +2634,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.2933E+09 OP Strain_on_CS_superconductor_____________________________________________ (strncon_cs)__________________ -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -3617,8 +3617,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 5.4592E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -3629,7 +3629,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.2933E+09 OP Strain_on_CS_superconductor_____________________________________________ (strncon_cs)__________________ -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -4612,8 +4612,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 5.4592E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -4624,7 +4624,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.2933E+09 OP Strain_on_CS_superconductor_____________________________________________ (strncon_cs)__________________ -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -5607,8 +5607,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 5.4592E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -5619,7 +5619,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.2933E+09 OP Strain_on_CS_superconductor_____________________________________________ (strncon_cs)__________________ -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -6602,8 +6602,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 5.4592E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -6614,7 +6614,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.2933E+09 OP Strain_on_CS_superconductor_____________________________________________ (strncon_cs)__________________ -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -7597,8 +7597,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 5.4592E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -7609,7 +7609,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.2933E+09 OP Strain_on_CS_superconductor_____________________________________________ (strncon_cs)__________________ -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -8592,8 +8592,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 5.4592E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -8604,7 +8604,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.2933E+09 OP Strain_on_CS_superconductor_____________________________________________ (strncon_cs)__________________ -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 diff --git a/process/costs.py b/process/costs.py index 0a8b5c7518..3a37475d71 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1669,7 +1669,7 @@ def acc2222(self): costpfsc = ( cost_variables.ucsc[pfcoil_variables.i_cs_superconductor - 1] * pfcoil_variables.awpoh - * (1 - pfcoil_variables.vfohc) + * (1 - pfcoil_variables.f_a_cs_void) * (1 - pfcoil_variables.fcuohsu) / pfcoil_variables.n_pf_coil_turns[ pfcoil_variables.n_cs_pf_coils - 1 @@ -1700,7 +1700,7 @@ def acc2222(self): costpfcu = ( cost_variables.uccu * pfcoil_variables.awpoh - * (1 - pfcoil_variables.vfohc) + * (1 - pfcoil_variables.f_a_cs_void) * pfcoil_variables.fcuohsu / pfcoil_variables.n_pf_coil_turns[ pfcoil_variables.n_cs_pf_coils - 1 @@ -1712,7 +1712,7 @@ def acc2222(self): costpfcu = ( cost_variables.uccu * pfcoil_variables.awpoh - * (1 - pfcoil_variables.vfohc) + * (1 - pfcoil_variables.f_a_cs_void) / pfcoil_variables.n_pf_coil_turns[ pfcoil_variables.n_cs_pf_coils - 1 ] diff --git a/process/pfcoil.py b/process/pfcoil.py index 74ec2675c4..68a3df02a7 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1126,7 +1126,7 @@ def ohcalc(self): csfv.t_structural_radial = 1.0e-3 # Non-steel area void fraction for coolant - pfv.f_a_pf_coil_void[pfv.n_cs_pf_coils - 1] = pfv.vfohc + pfv.f_a_pf_coil_void[pfv.n_cs_pf_coils - 1] = pfv.f_a_cs_void # Peak field at the End-Of-Flattop (EOF) # Occurs at inner edge of coil; bmaxoh2 and bzi are of opposite sign at EOF @@ -1244,7 +1244,7 @@ def ohcalc(self): if pfv.i_pf_conductor == 0: pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1] = ( pfv.awpoh - * (1.0e0 - pfv.vfohc) + * (1.0e0 - pfv.f_a_cs_void) * 2.0e0 * constants.pi * pfv.r_pf_coil_middle[pfv.n_cs_pf_coils - 1] @@ -1253,7 +1253,7 @@ def ohcalc(self): else: pfv.m_pf_coil_conductor[pfv.n_cs_pf_coils - 1] = ( pfv.awpoh - * (1.0e0 - pfv.vfohc) + * (1.0e0 - pfv.f_a_cs_void) * 2.0e0 * constants.pi * pfv.r_pf_coil_middle[pfv.n_cs_pf_coils - 1] @@ -1271,7 +1271,7 @@ def ohcalc(self): tmarg1, = self.superconpf( pfv.b_cs_peak_flat_top_end, - pfv.vfohc, + pfv.f_a_cs_void, pfv.fcuohsu, (abs(pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1]) / pfv.awpoh) * 1.0e6, @@ -1302,7 +1302,7 @@ def ohcalc(self): tmarg2, = self.superconpf( pfv.b_cs_peak_pulse_start, - pfv.vfohc, + pfv.f_a_cs_void, pfv.fcuohsu, (abs(pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1]) / pfv.awpoh) * 1.0e6, @@ -1329,7 +1329,7 @@ def ohcalc(self): * constants.pi * pfv.r_cs_middle * pfv.rho_pf_coil - / (pfv.a_cs_poloidal * (1.0e0 - pfv.vfohc)) + / (pfv.a_cs_poloidal * (1.0e0 - pfv.f_a_cs_void)) * (1.0e6 * pfv.c_pf_cs_coils_peak_ma[pfv.n_cs_pf_coils - 1]) ** 2 ) pfv.p_pf_coil_resistive_total_flat_top = ( @@ -2165,15 +2165,15 @@ def outpf(self): op.ovarre( self.outfile, " CS conductor cross-sectional area (m2)", - "(awpoh*(1-vfohc))", - pfv.awpoh * (1.0e0 - pfv.vfohc), + "(awpoh*(1-f_a_cs_void))", + pfv.awpoh * (1.0e0 - pfv.f_a_cs_void), "OP ", ) op.ovarre( self.outfile, " CS void cross-sectional area (m2)", - "(awpoh*vfohc)", - pfv.awpoh * pfv.vfohc, + "(awpoh*f_a_cs_void)", + pfv.awpoh * pfv.f_a_cs_void, "OP ", ) op.ovarre( @@ -2268,8 +2268,8 @@ def outpf(self): op.ovarre( self.outfile, "Void (coolant) fraction in conductor", - "(vfohc)", - pfv.vfohc, + "(f_a_cs_void)", + pfv.f_a_cs_void, ) op.ovarre( self.outfile, @@ -3037,7 +3037,7 @@ def superconpf( # The CS coil current/copper area calculation for quench protection # Copper area = (area of coil - area of steel)*(1- void fraction)* # (fraction of copper in strands) - # rcv.copperaoh_m2 = ioheof / (pfv.awpoh * (1.0 - pfv.vfohc) * pfv.fcuohsu) + # rcv.copperaoh_m2 = ioheof / (pfv.awpoh * (1.0 - pfv.f_a_cs_void) * pfv.fcuohsu) elif isumat == 7: # Durham Ginzburg-Landau critical surface model for Nb-Ti @@ -3066,7 +3066,7 @@ def superconpf( # The CS coil current at EOF # ioheof = bv.hmax * pfv.f_z_cs_tf_internal * bv.dr_cs * 2.0 * pfv.j_cs_flat_top_end # The CS coil current/copper area calculation for quench protection - # rcv.copperaoh_m2 = ioheof / (pfv.awpoh * (1.0 - pfv.vfohc) * pfv.fcuohsu) + # rcv.copperaoh_m2 = ioheof / (pfv.awpoh * (1.0 - pfv.f_a_cs_void) * pfv.fcuohsu) elif isumat == 9: # Hazelton experimental data + Zhai conceptual model for REBCO @@ -3082,7 +3082,7 @@ def superconpf( # The CS coil current at EOF # ioheof = bv.hmax * pfv.f_z_cs_tf_internal * bv.dr_cs * 2.0 * pfv.j_cs_flat_top_end # The CS coil current/copper area calculation for quench protection - # rcv.copperaoh_m2 = ioheof / (pfv.awpoh * (1.0 - pfv.vfohc) * pfv.fcuohsu) + # rcv.copperaoh_m2 = ioheof / (pfv.awpoh * (1.0 - pfv.f_a_cs_void) * pfv.fcuohsu) else: # Error condition @@ -3102,7 +3102,7 @@ def superconpf( ) # CS coil current/copper area calculation for quench protection rcv.copperaoh_m2 = ioheof / ( - pfv.awpoh * (1.0 - pfv.vfohc) * pfv.fcuohsu + pfv.awpoh * (1.0 - pfv.f_a_cs_void) * pfv.fcuohsu ) # Critical current density in winding pack diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index ba50278160..bc35a76502 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -297,7 +297,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) epsvmc, ftol, ipnvars, ioptimz, nineqns, ipeqns, boundu, icc, ipnfoms, name_xc use pfcoil_variables, only: rhopfbus, j_pf_coil_wp_peak, zref, fcuohsu, f_a_cs_steel, f_a_pf_coil_void, & j_cs_flat_top_end, sigpfcalw, alstroh, i_pf_conductor, fcupfsu, fvssu, etapsu, i_cs_stress, & - fb_cs_limit_max, ngc, rpf2, fcohbop, f_z_cs_tf_internal, vfohc, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & + fb_cs_limit_max, ngc, rpf2, fcohbop, f_z_cs_tf_internal, f_a_cs_void, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & n_pf_coil_groups, i_pf_superconductor, nfxfh, alfapf, routr, sigpfcf, rho_pf_coil, b_cs_limit_max, & n_pf_coils_in_group, nfixmx, c_pf_coil_turn_peak_input, i_pf_location, i_sup_pf_shape, rref, i_pf_current, & ccl0_ma, ccls_ma, ld_ratio_cst @@ -1915,8 +1915,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('f_a_pf_coil_void') call parse_real_array('f_a_pf_coil_void', f_a_pf_coil_void, isub1, ngc2, & 'Void fraction of PF coil', icode) - case ('vfohc') - call parse_real_variable('vfohc', vfohc, 0.0D0, 1.0D0, & + case ('f_a_cs_void') + call parse_real_variable('f_a_cs_void', f_a_cs_void, 0.0D0, 1.0D0, & 'Central Solenoid void fraction for coolant') case ('zref') call parse_real_array('zref', zref, isub1, n_pf_groups_max, & diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 1c0a7cc997..e5ad1592d1 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -320,7 +320,7 @@ module pfcoil_variables real(dp), dimension(ngc2) :: f_a_pf_coil_void !! winding pack void fraction of PF coil i for coolant - real(dp) :: vfohc + real(dp) :: f_a_cs_void !! void fraction of central solenoid conductor for coolant real(dp) :: vsbn @@ -496,7 +496,7 @@ subroutine init_pfcoil_variables temp_cs_margin = 0.0D0 n_pf_coil_turns = 0.0D0 f_a_pf_coil_void = 0.3D0 - vfohc = 0.3D0 + f_a_cs_void = 0.3D0 vsbn = 0.0D0 vsefbn = 0.0D0 vsefsu = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 36c2a15b7c..4d70329b6a 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -783,8 +783,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1407E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3996E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0797E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3199E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -795,7 +795,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.6256E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5052E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 46138cc045..4fac7a4e68 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -784,8 +784,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1407E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3996E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0797E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3199E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -796,7 +796,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.6256E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5052E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 54247f0d89..f89467d5e2 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -784,8 +784,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1407E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3996E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0797E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3199E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -796,7 +796,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.6256E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5052E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index c4d7513a37..e0e0e1ea4e 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -784,8 +784,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1407E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3996E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0797E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3199E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0797E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3199E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7411E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.1868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -796,7 +796,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.6256E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5052E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 460732d148..4489d9c3fe 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -787,8 +787,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1580E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3942E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0759E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3182E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0759E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3182E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7639E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.2019E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -799,7 +799,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.6032E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5029E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 0abb5889d8..9087419d8d 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -785,8 +785,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.8157E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.4641E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.1249E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3392E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.1249E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3392E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3516E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9362E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -797,7 +797,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.7111E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5002E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -1948,8 +1948,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.7740E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.4122E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0885E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3236E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0885E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3236E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3618E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9713E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -1960,7 +1960,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.7249E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5045E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -3111,8 +3111,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.7859E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.4050E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0835E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3215E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0835E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3215E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3809E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9863E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -3123,7 +3123,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.7388E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5074E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -4274,8 +4274,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.7854E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.4021E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0815E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3206E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0815E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3206E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3832E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9892E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -4286,7 +4286,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.7345E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5086E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -5437,8 +5437,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.7723E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.4171E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0920E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3251E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0920E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3251E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3552E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9647E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -5449,7 +5449,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.7279E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5092E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -6600,8 +6600,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6728E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3772E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0641E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3132E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0641E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3132E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.2955E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9529E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -6612,7 +6612,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.7019E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5008E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -7763,8 +7763,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6497E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3615E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0530E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3084E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0530E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3084E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.2882E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9576E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -7775,7 +7775,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.6962E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5019E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -8926,8 +8926,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6700E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3602E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0522E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3081E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0522E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3081E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3098E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9709E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -8938,7 +8938,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.7147E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5057E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -10089,8 +10089,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6862E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3557E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0490E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3067E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0490E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3067E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3305E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9855E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -10101,7 +10101,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.7317E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5072E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -11252,8 +11252,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6857E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3543E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0480E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3063E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0480E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3063E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3314E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9868E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -11264,7 +11264,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.7296E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5076E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -12415,8 +12415,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6819E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3642E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0549E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3092E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0549E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3092E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3178E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9733E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -12427,7 +12427,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.7126E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5092E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -13578,8 +13578,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6566E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3537E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0476E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3061E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0476E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3061E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3029E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9706E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -13590,7 +13590,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.6888E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5115E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -14741,8 +14741,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6562E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3519E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0463E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3056E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0463E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3056E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3043E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9725E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -14753,7 +14753,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.6861E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5123E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -15904,8 +15904,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6782E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3542E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0480E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3063E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0480E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3063E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3239E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9826E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -15916,7 +15916,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.7081E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5149E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -17067,8 +17067,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 8.6980E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3540E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0478E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3062E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0478E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3062E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.3439E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 4.9942E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -17079,7 +17079,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.7292E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5162E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 22354cdcfb..2ecbec6197 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -632,8 +632,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 5.4592E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -644,7 +644,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.2933E+09 OP Strain_on_CS_superconductor_____________________________________________ (strncon_cs)__________________ -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -1627,8 +1627,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 5.4592E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -1639,7 +1639,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.2933E+09 OP Strain_on_CS_superconductor_____________________________________________ (strncon_cs)__________________ -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -2622,8 +2622,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 5.4592E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -2634,7 +2634,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.2933E+09 OP Strain_on_CS_superconductor_____________________________________________ (strncon_cs)__________________ -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -3617,8 +3617,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 5.4592E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -3629,7 +3629,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.2933E+09 OP Strain_on_CS_superconductor_____________________________________________ (strncon_cs)__________________ -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -4612,8 +4612,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 5.4592E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -4624,7 +4624,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.2933E+09 OP Strain_on_CS_superconductor_____________________________________________ (strncon_cs)__________________ -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -5607,8 +5607,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 5.4592E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -5619,7 +5619,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.2933E+09 OP Strain_on_CS_superconductor_____________________________________________ (strncon_cs)__________________ -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -6602,8 +6602,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 5.4592E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -6614,7 +6614,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.2933E+09 OP Strain_on_CS_superconductor_____________________________________________ (strncon_cs)__________________ -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -7597,8 +7597,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 5.4592E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -7609,7 +7609,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.2933E+09 OP Strain_on_CS_superconductor_____________________________________________ (strncon_cs)__________________ -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 @@ -8592,8 +8592,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 5.0000E-02 ITV CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 1.1774E+01 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 7.7989E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 5.4592E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 2.3397E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 5.4592E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 2.3397E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 3.9748E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 3.3760E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -8604,7 +8604,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.2933E+09 OP Strain_on_CS_superconductor_____________________________________________ (strncon_cs)__________________ -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 4.1259E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 85373c566f..093511e748 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7917,7 +7917,7 @@ "vfi": 0.0, "vfi_star": 0.0, "vfile": 14.0, - "vfohc": 0.3, + "f_a_cs_void": 0.3, "vforce": 0.0, "vforce_inboard_tot": 0.0, "vforce_outboard": 0.0, @@ -11026,7 +11026,7 @@ "vfi": "", "vfi_star": "", "vfile": "Verbose diagnostics file", - "vfohc": "void fraction of central solenoid conductor for coolant", + "f_a_cs_void": "void fraction of central solenoid conductor for coolant", "vforce": "vertical tension on inboard leg/coil (N)", "vforce_inboard_tot": "Total inboard vertical tension (all coils) [N]", "vforce_outboard": "Vertical tension on outboard leg/coil (N)", @@ -14949,7 +14949,7 @@ "lb": 0.0, "ub": 1.0 }, - "vfohc": { + "f_a_cs_void": { "lb": 0.0, "ub": 1.0 }, @@ -18993,7 +18993,7 @@ "temp_cs_margin", "turns", "f_a_pf_coil_void", - "vfohc", + "f_a_cs_void", "vsbn", "vsefbn", "vsefsu", @@ -20877,7 +20877,7 @@ "f_a_pf_coil_void": "real_array", "vfblkt": "real_variable", "vfcblkt": "real_variable", - "vfohc": "real_variable", + "f_a_cs_void": "real_variable", "vfpblkt": "real_variable", "vfshld": "real_variable", "vftf": "real_variable", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 00af64ef18..53d5e1802e 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -196,7 +196,7 @@ def test_ohcalc(monkeypatch, reinitialise_error_module, pfcoil): monkeypatch.setattr(pfv, "i_cs_stress", 0) monkeypatch.setattr(pfv, "j_cs_flat_top_end", 1.693e7) monkeypatch.setattr(pfv, "r_cs_middle", 3.0) - monkeypatch.setattr(pfv, "vfohc", 3.0e-1) + monkeypatch.setattr(pfv, "f_a_cs_void", 3.0e-1) monkeypatch.setattr(pfv, "jcableoh_bop", 1.069e8) monkeypatch.setattr(pfv, "fcuohsu", 7.000e-1) monkeypatch.setattr(pfv, "i_cs_superconductor", 5) diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 60d0cd37c4..d335ce4d19 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1653,7 +1653,7 @@ i_pf_conductor = 0 * DESCRIPTION: Central solenoid steel fraction * JUSTIFICATION: Not used. Using default -*vfohc = +*f_a_cs_void = * DESCRIPTION: Void fraction of central solenoid conductor for coolant * JUSTIFICATION: Not yet set. diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 5612b3d171..669deb6048 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -787,8 +787,8 @@ Gap_between_central_solenoid_and_TF_coil_(m)____________________________ (dr_cs_tf_gap)_______________________ 8.0000E-02 CS_overall_cross-sectional_area_(m2)____________________________________ (a_cs_poloidal)______________________ 9.1580E+00 OP CS_conductor+void_cross-sectional_area_(m2)_____________________________ (awpoh)_______________________ 4.3942E+00 OP - ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-vfohc))_____________ 3.0759E+00 OP - ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*vfohc)_________________ 1.3182E+00 OP + ___CS_conductor_cross-sectional_area_(m2)_______________________________ (awpoh*(1-f_a_cs_void))_____________ 3.0759E+00 OP + ___CS_void_cross-sectional_area_(m2)____________________________________ (awpoh*f_a_cs_void)_________________ 1.3182E+00 OP CS_steel_cross-sectional_area_(m2)______________________________________ (a_cs_poloidal-awpoh)________________ 4.7639E+00 OP CS_steel_area_fraction__________________________________________________ (f_a_cs_steel)_______________ 5.2019E-01 ITV Switch_for_CS_stress_calculation________________________________________ (i_cs_stress)_________________ 0 @@ -799,7 +799,7 @@ Axial_force_in_CS_(N)___________________________________________________ (axial_force)_________________ -1.6032E+09 OP Residual_manufacturing_strain_in_CS_superconductor_material_____________ (tfcoil_variables.str_cs_con_r -5.0000E-03 Copper_fraction_in_strand_______________________________________________ (fcuohsu)_____________________ 7.0000E-01 - Void_(coolant)_fraction_in_conductor____________________________________ (vfohc)_______________________ 3.0000E-01 + Void_(coolant)_fraction_in_conductor____________________________________ (f_a_cs_void)_______________________ 3.0000E-01 Helium_coolant_temperature_(K)__________________________________________ (tftmp)_______________________ 4.7500E+00 CS_temperature_margin_(K)_______________________________________________ (temp_cs_margin)_____________________ 1.5029E+00 OP Minimum_permitted_temperature_margin_(K)________________________________ (tmargmin_cs)_________________ 1.5000E+00 diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index b46fb7df65..c57e74c99e 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -2028,7 +2028,7 @@ class Acc2222Param(NamedTuple): i_pf_conductor: Any = None - vfohc: Any = None + f_a_cs_void: Any = None n_cs_pf_coils: Any = None @@ -2130,7 +2130,7 @@ class Acc2222Param(NamedTuple): j_crit_str_cs=100.0, j_crit_str_pf=200.0, i_pf_conductor=0, - vfohc=0.29999999999999999, + f_a_cs_void=0.29999999999999999, n_cs_pf_coils=7, n_pf_coil_turns=np.array( np.array( @@ -2326,7 +2326,7 @@ class Acc2222Param(NamedTuple): j_crit_str_cs=100.0, j_crit_str_pf=200.0, i_pf_conductor=0, - vfohc=0.29999999999999999, + f_a_cs_void=0.29999999999999999, n_cs_pf_coils=7, n_pf_coil_turns=np.array( np.array( @@ -2522,7 +2522,7 @@ class Acc2222Param(NamedTuple): j_crit_str_cs=100.0, j_crit_str_pf=200.0, i_pf_conductor=0, - vfohc=0.29999999999999999, + f_a_cs_void=0.29999999999999999, n_cs_pf_coils=7, n_pf_coil_turns=np.array( np.array( @@ -2719,7 +2719,7 @@ def test_acc2222(acc2222param, monkeypatch, costs): monkeypatch.setattr(pfcoil_variables, "i_pf_conductor", acc2222param.i_pf_conductor) - monkeypatch.setattr(pfcoil_variables, "vfohc", acc2222param.vfohc) + monkeypatch.setattr(pfcoil_variables, "f_a_cs_void", acc2222param.f_a_cs_void) monkeypatch.setattr(pfcoil_variables, "n_cs_pf_coils", acc2222param.n_cs_pf_coils) From c776f4d5d796c6804f63a98c7eaf8a39c9a933f8 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 11:17:15 +0000 Subject: [PATCH 55/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'vsohsu'=20to=20'?= =?UTF-8?q?vs=5Fcs=5Framp'=20for=20clarity=20and=20consistency=20across=20?= =?UTF-8?q?multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 8 ++++---- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_pfcoil.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index 68a3df02a7..5bb9cbb37e 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1601,12 +1601,12 @@ def vsec(self): ] * pfv.c_pf_coil_turn[pfv.n_pf_cs_plasma_circuits - 2, 2] ) - pfv.vsohsu = ( + pfv.vs_cs_ramp = ( pf.vsdum[pfv.n_cs_pf_coils - 1, 1] - pf.vsdum[pfv.n_cs_pf_coils - 1, 0] ) # Total available volt-seconds for start-up - pfv.vssu = pfv.vsohsu + pfv.vsefsu + pfv.vssu = pfv.vs_cs_ramp + pfv.vsefsu # Burn volt-seconds if bv.iohcl != 0: @@ -1633,7 +1633,7 @@ def vsec(self): pfv.vstot = pfv.vssu + pfv.vsbn pfv.vseft = pfv.vsefsu + pfv.vsefbn - pfv.vsoh = pfv.vsohbn + pfv.vsohsu + pfv.vsoh = pfv.vsohbn + pfv.vs_cs_ramp def hoop_stress(self, r): """Calculation of hoop stress of central solenoid. @@ -2696,7 +2696,7 @@ def outvolt(self): ) op.write( self.outfile, - f"CS coil:\t\t{pfv.vsohsu:.2f}\t\t\t\t{pfv.vsohbn:.2f}\t\t\t{pfv.vsoh:.2f}", + f"CS coil:\t\t{pfv.vs_cs_ramp:.2f}\t\t\t\t{pfv.vsohbn:.2f}\t\t\t{pfv.vsoh:.2f}", ) op.write( self.outfile, "\t" * 3 + "-" * 7 + "\t" * 4 + "-" * 7 + "\t" * 3 + "-" * 7 diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index e5ad1592d1..cc67167525 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -341,7 +341,7 @@ module pfcoil_variables real(dp) :: vsohbn !! central solenoid flux swing for burn (Wb) - real(dp) :: vsohsu + real(dp) :: vs_cs_ramp !! central solenoid flux swing for startup (Wb) real(dp) :: vssu @@ -503,7 +503,7 @@ subroutine init_pfcoil_variables vseft = 0.0D0 vsoh = 0.0D0 vsohbn = 0.0D0 - vsohsu = 0.0D0 + vs_cs_ramp = 0.0D0 vssu = 0.0D0 vstot = 0.0D0 waves = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 093511e748..4caeb7eaec 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8002,7 +8002,7 @@ "vs_plasma_ind_ramp": 0.0, "vsoh": 0.0, "vsohbn": 0.0, - "vsohsu": 0.0, + "vs_cs_ramp": 0.0, "vs_plasma_res_ramp": 0.0, "vs_plasma_total_required": 0.0, "vssu": 0.0, @@ -11111,7 +11111,7 @@ "vs_plasma_ind_ramp": "internal and external plasma inductance V-s (Wb)", "vsoh": "total flux swing from the central solenoid (Wb)", "vsohbn": "central solenoid flux swing for burn (Wb)", - "vsohsu": "central solenoid flux swing for startup (Wb)", + "vs_cs_ramp": "central solenoid flux swing for startup (Wb)", "vs_plasma_res_ramp": "resistive losses in startup V-s (Wb)", "vs_plasma_total_required": "total V-s needed (Wb)", "vssu": "total flux swing for startup (`constraint eqn 51` to enforce vssu=vs_plasma_res_ramp+vs_plasma_ind_ramp) (Wb)", @@ -19000,7 +19000,7 @@ "vseft", "vsoh", "vsohbn", - "vsohsu", + "vs_cs_ramp", "vssu", "vstot", "waves", diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index fbc7512e4b..cf6bb35c73 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1411,7 +1411,7 @@ def test_vsec(pfcoil, monkeypatch): ), ) monkeypatch.setattr(pfv, "vsefbn", 0) - monkeypatch.setattr(pfv, "vsohsu", 0) + monkeypatch.setattr(pfv, "vs_cs_ramp", 0) monkeypatch.setattr(pfv, "vseft", 0) monkeypatch.setattr(pfv, "vsoh", 0) monkeypatch.setattr(pfv, "vssu", 0) From f37ab3cd0113d0a89f40f3d6c65df8d379c63377 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 11:18:17 +0000 Subject: [PATCH 56/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'vsohbn'=20to=20'?= =?UTF-8?q?vs=5Fcs=5Fburn'=20for=20clarity=20and=20consistency=20across=20?= =?UTF-8?q?multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 8 ++++---- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_pfcoil.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index 5bb9cbb37e..a318641bf7 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1616,7 +1616,7 @@ def vsec(self): ] * pfv.c_pf_coil_turn[pfv.n_pf_cs_plasma_circuits - 2, 4] ) - pfv.vsohbn = ( + pfv.vs_cs_burn = ( pf.vsdum[pfv.n_cs_pf_coils - 1, 2] - pf.vsdum[pfv.n_cs_pf_coils - 1, 1] ) @@ -1629,11 +1629,11 @@ def vsec(self): ) pfv.vsefbn = pfv.vsefbn + (pf.vsdum[i, 2] - pf.vsdum[i, 1]) - pfv.vsbn = pfv.vsohbn + pfv.vsefbn + pfv.vsbn = pfv.vs_cs_burn + pfv.vsefbn pfv.vstot = pfv.vssu + pfv.vsbn pfv.vseft = pfv.vsefsu + pfv.vsefbn - pfv.vsoh = pfv.vsohbn + pfv.vs_cs_ramp + pfv.vsoh = pfv.vs_cs_burn + pfv.vs_cs_ramp def hoop_stress(self, r): """Calculation of hoop stress of central solenoid. @@ -2696,7 +2696,7 @@ def outvolt(self): ) op.write( self.outfile, - f"CS coil:\t\t{pfv.vs_cs_ramp:.2f}\t\t\t\t{pfv.vsohbn:.2f}\t\t\t{pfv.vsoh:.2f}", + f"CS coil:\t\t{pfv.vs_cs_ramp:.2f}\t\t\t\t{pfv.vs_cs_burn:.2f}\t\t\t{pfv.vsoh:.2f}", ) op.write( self.outfile, "\t" * 3 + "-" * 7 + "\t" * 4 + "-" * 7 + "\t" * 3 + "-" * 7 diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index cc67167525..d638304ba7 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -338,7 +338,7 @@ module pfcoil_variables real(dp) :: vsoh !! total flux swing from the central solenoid (Wb) - real(dp) :: vsohbn + real(dp) :: vs_cs_burn !! central solenoid flux swing for burn (Wb) real(dp) :: vs_cs_ramp @@ -502,7 +502,7 @@ subroutine init_pfcoil_variables vsefsu = 0.0D0 vseft = 0.0D0 vsoh = 0.0D0 - vsohbn = 0.0D0 + vs_cs_burn = 0.0D0 vs_cs_ramp = 0.0D0 vssu = 0.0D0 vstot = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 4caeb7eaec..1d52b42b38 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8001,7 +8001,7 @@ "vshift": 0.0, "vs_plasma_ind_ramp": 0.0, "vsoh": 0.0, - "vsohbn": 0.0, + "vs_cs_burn": 0.0, "vs_cs_ramp": 0.0, "vs_plasma_res_ramp": 0.0, "vs_plasma_total_required": 0.0, @@ -11110,7 +11110,7 @@ "vshift": "plasma/device midplane vertical shift - single null", "vs_plasma_ind_ramp": "internal and external plasma inductance V-s (Wb)", "vsoh": "total flux swing from the central solenoid (Wb)", - "vsohbn": "central solenoid flux swing for burn (Wb)", + "vs_cs_burn": "central solenoid flux swing for burn (Wb)", "vs_cs_ramp": "central solenoid flux swing for startup (Wb)", "vs_plasma_res_ramp": "resistive losses in startup V-s (Wb)", "vs_plasma_total_required": "total V-s needed (Wb)", @@ -18999,7 +18999,7 @@ "vsefsu", "vseft", "vsoh", - "vsohbn", + "vs_cs_burn", "vs_cs_ramp", "vssu", "vstot", diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index cf6bb35c73..354ef3f898 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1224,7 +1224,7 @@ def test_vsec(pfcoil, monkeypatch): monkeypatch.setattr(pfv, "vsefsu", 0) monkeypatch.setattr(pfv, "vsbn", 0) monkeypatch.setattr(pfv, "n_cs_pf_coils", 7) - monkeypatch.setattr(pfv, "vsohbn", 0) + monkeypatch.setattr(pfv, "vs_cs_burn", 0) monkeypatch.setattr( pfv, "c_pf_coil_turn", From 965638a7ffe65fe7a29346f33721f5c66005b099 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 11:20:15 +0000 Subject: [PATCH 57/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'vsefsu'=20to=20'?= =?UTF-8?q?vs=5Fpf=5Fcoils=5Ftotal=5Framp'=20for=20clarity=20and=20consist?= =?UTF-8?q?ency=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 12 +++++++----- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_pfcoil.py | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index a318641bf7..9f9c1f6b83 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1574,7 +1574,7 @@ def vsec(self): else: pf.nef = pfv.n_pf_cs_plasma_circuits - 2 - pfv.vsefsu = 0.0e0 + pfv.vs_pf_coils_total_ramp = 0.0e0 for i in range(pf.nef): pf.vsdum[i, 0] = ( @@ -1585,7 +1585,9 @@ def vsec(self): pfv.ind_pf_cs_plasma_mutual[pfv.n_pf_cs_plasma_circuits - 1, i] * pfv.c_pf_coil_turn[i, 2] ) - pfv.vsefsu = pfv.vsefsu + (pf.vsdum[i, 1] - pf.vsdum[i, 0]) + pfv.vs_pf_coils_total_ramp = pfv.vs_pf_coils_total_ramp + ( + pf.vsdum[i, 1] - pf.vsdum[i, 0] + ) # Central Solenoid startup volt-seconds if bv.iohcl != 0: @@ -1606,7 +1608,7 @@ def vsec(self): ) # Total available volt-seconds for start-up - pfv.vssu = pfv.vs_cs_ramp + pfv.vsefsu + pfv.vssu = pfv.vs_cs_ramp + pfv.vs_pf_coils_total_ramp # Burn volt-seconds if bv.iohcl != 0: @@ -1632,7 +1634,7 @@ def vsec(self): pfv.vsbn = pfv.vs_cs_burn + pfv.vsefbn pfv.vstot = pfv.vssu + pfv.vsbn - pfv.vseft = pfv.vsefsu + pfv.vsefbn + pfv.vseft = pfv.vs_pf_coils_total_ramp + pfv.vsefbn pfv.vsoh = pfv.vs_cs_burn + pfv.vs_cs_ramp def hoop_stress(self, r): @@ -2692,7 +2694,7 @@ def outvolt(self): op.write(self.outfile, "\t" * 3 + "start-up\t\t\t_burn\t\t\ttotal") op.write( self.outfile, - f"PF coils:\t\t{pfv.vsefsu:.2f}\t\t\t\t{pfv.vsefbn:.2f}\t\t\t{pfv.vseft:.2f}", + f"PF coils:\t\t{pfv.vs_pf_coils_total_ramp:.2f}\t\t\t\t{pfv.vsefbn:.2f}\t\t\t{pfv.vseft:.2f}", ) op.write( self.outfile, diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index d638304ba7..9dfa8cce0e 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -329,7 +329,7 @@ module pfcoil_variables real(dp) :: vsefbn !! flux swing from PF coils for burn (Wb) - real(dp) :: vsefsu + real(dp) :: vs_pf_coils_total_ramp !! flux swing from PF coils for startup (Wb) real(dp) :: vseft @@ -499,7 +499,7 @@ subroutine init_pfcoil_variables f_a_cs_void = 0.3D0 vsbn = 0.0D0 vsefbn = 0.0D0 - vsefsu = 0.0D0 + vs_pf_coils_total_ramp = 0.0D0 vseft = 0.0D0 vsoh = 0.0D0 vs_cs_burn = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 1d52b42b38..4c63419e28 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7996,7 +7996,7 @@ "vs_plasma_burn_required": 0.0, "vsdum": 0.0, "vsefbn": 0.0, - "vsefsu": 0.0, + "vs_pf_coils_total_ramp": 0.0, "vseft": 0.0, "vshift": 0.0, "vs_plasma_ind_ramp": 0.0, @@ -11105,7 +11105,7 @@ "vs_plasma_burn_required": "V-s needed during flat-top (heat + burn times) (Wb)", "vsdum": "", "vsefbn": "flux swing from PF coils for burn (Wb)", - "vsefsu": "flux swing from PF coils for startup (Wb)", + "vs_pf_coils_total_ramp": "flux swing from PF coils for startup (Wb)", "vseft": "total flux swing from PF coils (Wb)", "vshift": "plasma/device midplane vertical shift - single null", "vs_plasma_ind_ramp": "internal and external plasma inductance V-s (Wb)", @@ -18996,7 +18996,7 @@ "f_a_cs_void", "vsbn", "vsefbn", - "vsefsu", + "vs_pf_coils_total_ramp", "vseft", "vsoh", "vs_cs_burn", diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index 354ef3f898..5b420704db 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1221,7 +1221,7 @@ def test_vsec(pfcoil, monkeypatch): :type monkeypatch: _pytest.monkeypatch.MonkeyPatch """ monkeypatch.setattr(bv, "iohcl", 1) - monkeypatch.setattr(pfv, "vsefsu", 0) + monkeypatch.setattr(pfv, "vs_pf_coils_total_ramp", 0) monkeypatch.setattr(pfv, "vsbn", 0) monkeypatch.setattr(pfv, "n_cs_pf_coils", 7) monkeypatch.setattr(pfv, "vs_cs_burn", 0) From 669e22782581ce18f11a39574302405d6647d719 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 11:21:49 +0000 Subject: [PATCH 58/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'vssu'=20to=20'vs?= =?UTF-8?q?=5Fcs=5Fpf=5Ftotal=5Framp'=20for=20clarity=20and=20consistency?= =?UTF-8?q?=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 6 +++--- source/fortran/constraint_equations.f90 | 10 +++++----- source/fortran/pfcoil_variables.f90 | 6 +++--- tests/integration/ref_dicts.json | 6 +++--- tests/regression/input_files/st_regression.IN.DAT | 2 +- tests/unit/test_pfcoil.py | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index 9f9c1f6b83..a2a1381a11 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1608,7 +1608,7 @@ def vsec(self): ) # Total available volt-seconds for start-up - pfv.vssu = pfv.vs_cs_ramp + pfv.vs_pf_coils_total_ramp + pfv.vs_cs_pf_total_ramp = pfv.vs_cs_ramp + pfv.vs_pf_coils_total_ramp # Burn volt-seconds if bv.iohcl != 0: @@ -1633,7 +1633,7 @@ def vsec(self): pfv.vsbn = pfv.vs_cs_burn + pfv.vsefbn - pfv.vstot = pfv.vssu + pfv.vsbn + pfv.vstot = pfv.vs_cs_pf_total_ramp + pfv.vsbn pfv.vseft = pfv.vs_pf_coils_total_ramp + pfv.vsefbn pfv.vsoh = pfv.vs_cs_burn + pfv.vs_cs_ramp @@ -2705,7 +2705,7 @@ def outvolt(self): ) op.write( self.outfile, - f"Total:\t\t\t{pfv.vssu:.2f}\t\t\t\t{pfv.vsbn:.2f}\t\t\t{pfv.vstot:.2f}", + f"Total:\t\t\t{pfv.vs_cs_pf_total_ramp:.2f}\t\t\t\t{pfv.vsbn:.2f}\t\t\t{pfv.vstot:.2f}", ) op.oblnkl(self.outfile) diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 428d9a4498..d248e088bb 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2161,9 +2161,9 @@ subroutine constraint_eqn_051(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! vs_plasma_res_ramp : input real : resistive losses in startup V-s (Wb) !! vs_plasma_ind_ramp : input real : internal and external plasma inductance V-s (Wb)) - !! vssu : input real : total flux swing for startup (Wb) + !! vs_cs_pf_total_ramp : input real : total flux swing for startup (Wb) use physics_variables, only: vs_plasma_res_ramp, vs_plasma_ind_ramp - use pfcoil_variables, only: vssu, fvssu + use pfcoil_variables, only: vs_cs_pf_total_ramp, fvssu implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -2171,9 +2171,9 @@ subroutine constraint_eqn_051(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 - fvssu * abs((vs_plasma_res_ramp+vs_plasma_ind_ramp) / vssu) - tmp_con = vssu * (1.0D0 - tmp_cc) - tmp_err = vssu * tmp_cc + tmp_cc = 1.0D0 - fvssu * abs((vs_plasma_res_ramp+vs_plasma_ind_ramp) / vs_cs_pf_total_ramp) + tmp_con = vs_cs_pf_total_ramp * (1.0D0 - tmp_cc) + tmp_err = vs_cs_pf_total_ramp * tmp_cc tmp_symbol = '=' tmp_units = 'V.s' diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 9dfa8cce0e..e0be0754db 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -344,8 +344,8 @@ module pfcoil_variables real(dp) :: vs_cs_ramp !! central solenoid flux swing for startup (Wb) - real(dp) :: vssu - !! total flux swing for startup (`constraint eqn 51` to enforce vssu=vs_plasma_res_ramp+vs_plasma_ind_ramp) (Wb) + real(dp) :: vs_cs_pf_total_ramp + !! total flux swing for startup (`constraint eqn 51` to enforce vs_cs_pf_total_ramp=vs_plasma_res_ramp+vs_plasma_ind_ramp) (Wb) real(dp) :: vstot !! total flux swing for pulse (Wb) @@ -504,7 +504,7 @@ subroutine init_pfcoil_variables vsoh = 0.0D0 vs_cs_burn = 0.0D0 vs_cs_ramp = 0.0D0 - vssu = 0.0D0 + vs_cs_pf_total_ramp = 0.0D0 vstot = 0.0D0 waves = 0.0D0 m_pf_coil_conductor_total = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 4c63419e28..6538f781a8 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8005,7 +8005,7 @@ "vs_cs_ramp": 0.0, "vs_plasma_res_ramp": 0.0, "vs_plasma_total_required": 0.0, - "vssu": 0.0, + "vs_cs_pf_total_ramp": 0.0, "vstot": 0.0, "vte1_": 18755328.0, "vtfkv": 0.0, @@ -11114,7 +11114,7 @@ "vs_cs_ramp": "central solenoid flux swing for startup (Wb)", "vs_plasma_res_ramp": "resistive losses in startup V-s (Wb)", "vs_plasma_total_required": "total V-s needed (Wb)", - "vssu": "total flux swing for startup (`constraint eqn 51` to enforce vssu=vs_plasma_res_ramp+vs_plasma_ind_ramp) (Wb)", + "vs_cs_pf_total_ramp": "total flux swing for startup (`constraint eqn 51` to enforce vs_cs_pf_total_ramp=vs_plasma_res_ramp+vs_plasma_ind_ramp) (Wb)", "vstot": "total flux swing for pulse (Wb)", "vte1_": "", "vtfkv": "TF coil voltage for resistive coil including bus (kV)", @@ -19001,7 +19001,7 @@ "vsoh", "vs_cs_burn", "vs_cs_ramp", - "vssu", + "vs_cs_pf_total_ramp", "vstot", "waves", "m_pf_coil_conductor_total", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index d335ce4d19..5f2b6a9c22 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1719,7 +1719,7 @@ i_pf_conductor = 0 *icc = 51 * DESCRIPTION: Constraint equation to enforce startup flux = able startup flux * JUSTIFICATION: Turned off, do not care about startup flux. -* VARIABLES: vssu,vs_plasma_ind_ramp,vs_plasma_res_ramp calculated in situ +* VARIABLES: vs_cs_pf_total_ramp,vs_plasma_ind_ramp,vs_plasma_res_ramp calculated in situ *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index 5b420704db..cdb5b7c968 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1414,7 +1414,7 @@ def test_vsec(pfcoil, monkeypatch): monkeypatch.setattr(pfv, "vs_cs_ramp", 0) monkeypatch.setattr(pfv, "vseft", 0) monkeypatch.setattr(pfv, "vsoh", 0) - monkeypatch.setattr(pfv, "vssu", 0) + monkeypatch.setattr(pfv, "vs_cs_pf_total_ramp", 0) monkeypatch.setattr(pfv, "vstot", 0) monkeypatch.setattr(pfv, "n_pf_cs_plasma_circuits", 8) monkeypatch.setattr( From 01afd4f9221cdc7eaa9e5d57fc14d13bcda239eb Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 11:23:31 +0000 Subject: [PATCH 59/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'vsefbn'=20to=20'?= =?UTF-8?q?vs=5Fpf=5Fcoils=5Ftotal=5Fburn'=20for=20clarity=20and=20consist?= =?UTF-8?q?ency=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 12 +++++++----- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_pfcoil.py | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index a2a1381a11..c7ff2e6d30 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1623,18 +1623,20 @@ def vsec(self): ) # PF volt-seconds during burn - pfv.vsefbn = 0.0e0 + pfv.vs_pf_coils_total_burn = 0.0e0 for i in range(pf.nef): pf.vsdum[i, 2] = ( pfv.ind_pf_cs_plasma_mutual[pfv.n_pf_cs_plasma_circuits - 1, i] * pfv.c_pf_coil_turn[i, 4] ) - pfv.vsefbn = pfv.vsefbn + (pf.vsdum[i, 2] - pf.vsdum[i, 1]) + pfv.vs_pf_coils_total_burn = pfv.vs_pf_coils_total_burn + ( + pf.vsdum[i, 2] - pf.vsdum[i, 1] + ) - pfv.vsbn = pfv.vs_cs_burn + pfv.vsefbn + pfv.vsbn = pfv.vs_cs_burn + pfv.vs_pf_coils_total_burn pfv.vstot = pfv.vs_cs_pf_total_ramp + pfv.vsbn - pfv.vseft = pfv.vs_pf_coils_total_ramp + pfv.vsefbn + pfv.vseft = pfv.vs_pf_coils_total_ramp + pfv.vs_pf_coils_total_burn pfv.vsoh = pfv.vs_cs_burn + pfv.vs_cs_ramp def hoop_stress(self, r): @@ -2694,7 +2696,7 @@ def outvolt(self): op.write(self.outfile, "\t" * 3 + "start-up\t\t\t_burn\t\t\ttotal") op.write( self.outfile, - f"PF coils:\t\t{pfv.vs_pf_coils_total_ramp:.2f}\t\t\t\t{pfv.vsefbn:.2f}\t\t\t{pfv.vseft:.2f}", + f"PF coils:\t\t{pfv.vs_pf_coils_total_ramp:.2f}\t\t\t\t{pfv.vs_pf_coils_total_burn:.2f}\t\t\t{pfv.vseft:.2f}", ) op.write( self.outfile, diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index e0be0754db..90d99ac8b2 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -326,7 +326,7 @@ module pfcoil_variables real(dp) :: vsbn !! total flux swing available for burn (Wb) - real(dp) :: vsefbn + real(dp) :: vs_pf_coils_total_burn !! flux swing from PF coils for burn (Wb) real(dp) :: vs_pf_coils_total_ramp @@ -498,7 +498,7 @@ subroutine init_pfcoil_variables f_a_pf_coil_void = 0.3D0 f_a_cs_void = 0.3D0 vsbn = 0.0D0 - vsefbn = 0.0D0 + vs_pf_coils_total_burn = 0.0D0 vs_pf_coils_total_ramp = 0.0D0 vseft = 0.0D0 vsoh = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 6538f781a8..582660f275 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7995,7 +7995,7 @@ "vsbn": 0.0, "vs_plasma_burn_required": 0.0, "vsdum": 0.0, - "vsefbn": 0.0, + "vs_pf_coils_total_burn": 0.0, "vs_pf_coils_total_ramp": 0.0, "vseft": 0.0, "vshift": 0.0, @@ -11104,7 +11104,7 @@ "vsbn": "total flux swing available for burn (Wb)", "vs_plasma_burn_required": "V-s needed during flat-top (heat + burn times) (Wb)", "vsdum": "", - "vsefbn": "flux swing from PF coils for burn (Wb)", + "vs_pf_coils_total_burn": "flux swing from PF coils for burn (Wb)", "vs_pf_coils_total_ramp": "flux swing from PF coils for startup (Wb)", "vseft": "total flux swing from PF coils (Wb)", "vshift": "plasma/device midplane vertical shift - single null", @@ -18995,7 +18995,7 @@ "f_a_pf_coil_void", "f_a_cs_void", "vsbn", - "vsefbn", + "vs_pf_coils_total_burn", "vs_pf_coils_total_ramp", "vseft", "vsoh", diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index cdb5b7c968..34fd4e2cf2 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1410,7 +1410,7 @@ def test_vsec(pfcoil, monkeypatch): order="F", ), ) - monkeypatch.setattr(pfv, "vsefbn", 0) + monkeypatch.setattr(pfv, "vs_pf_coils_total_burn", 0) monkeypatch.setattr(pfv, "vs_cs_ramp", 0) monkeypatch.setattr(pfv, "vseft", 0) monkeypatch.setattr(pfv, "vsoh", 0) From 9f16985409f7be1ebd234b77f050cfdd79143d81 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 11:24:49 +0000 Subject: [PATCH 60/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'vsbn'=20to=20'vs?= =?UTF-8?q?=5Fcs=5Fpf=5Ftotal=5Fburn'=20for=20clarity=20and=20consistency?= =?UTF-8?q?=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 6 +++--- process/pulse.py | 4 ++-- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_pfcoil.py | 4 ++-- tests/unit/test_pulse.py | 10 ++++++---- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index c7ff2e6d30..9f4ba3a854 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1633,9 +1633,9 @@ def vsec(self): pf.vsdum[i, 2] - pf.vsdum[i, 1] ) - pfv.vsbn = pfv.vs_cs_burn + pfv.vs_pf_coils_total_burn + pfv.vs_cs_pf_total_burn = pfv.vs_cs_burn + pfv.vs_pf_coils_total_burn - pfv.vstot = pfv.vs_cs_pf_total_ramp + pfv.vsbn + pfv.vstot = pfv.vs_cs_pf_total_ramp + pfv.vs_cs_pf_total_burn pfv.vseft = pfv.vs_pf_coils_total_ramp + pfv.vs_pf_coils_total_burn pfv.vsoh = pfv.vs_cs_burn + pfv.vs_cs_ramp @@ -2707,7 +2707,7 @@ def outvolt(self): ) op.write( self.outfile, - f"Total:\t\t\t{pfv.vs_cs_pf_total_ramp:.2f}\t\t\t\t{pfv.vsbn:.2f}\t\t\t{pfv.vstot:.2f}", + f"Total:\t\t\t{pfv.vs_cs_pf_total_ramp:.2f}\t\t\t\t{pfv.vs_cs_pf_total_burn:.2f}\t\t\t{pfv.vstot:.2f}", ) op.oblnkl(self.outfile) diff --git a/process/pulse.py b/process/pulse.py index 595efcdd99..96023f4d4d 100644 --- a/process/pulse.py +++ b/process/pulse.py @@ -169,8 +169,8 @@ def burn(self, output: bool): # (Previously calculated as (abs(pfcoil_variables.vstot) - vssoft) ) vsmax = ( - -pfcoil_variables.vsbn - ) # pfcoil_variables.vsbn is (or should be...) negative + -pfcoil_variables.vs_cs_pf_total_burn + ) # pfcoil_variables.vs_cs_pf_total_burn is (or should be...) negative # Loop voltage during flat-top (including MHD sawtooth enhancement) diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 90d99ac8b2..aad652b5ce 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -323,7 +323,7 @@ module pfcoil_variables real(dp) :: f_a_cs_void !! void fraction of central solenoid conductor for coolant - real(dp) :: vsbn + real(dp) :: vs_cs_pf_total_burn !! total flux swing available for burn (Wb) real(dp) :: vs_pf_coils_total_burn @@ -497,7 +497,7 @@ subroutine init_pfcoil_variables n_pf_coil_turns = 0.0D0 f_a_pf_coil_void = 0.3D0 f_a_cs_void = 0.3D0 - vsbn = 0.0D0 + vs_cs_pf_total_burn = 0.0D0 vs_pf_coils_total_burn = 0.0D0 vs_pf_coils_total_ramp = 0.0D0 vseft = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 582660f275..dfbb769d06 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7992,7 +7992,7 @@ "vportpmax": 0.0, "vporttmax": 0.0, "vpumpn": 0.0, - "vsbn": 0.0, + "vs_cs_pf_total_burn": 0.0, "vs_plasma_burn_required": 0.0, "vsdum": 0.0, "vs_pf_coils_total_burn": 0.0, @@ -11101,7 +11101,7 @@ "vportpmax": "maximum available poloidal extent for vertical ports (m)", "vporttmax": "maximum available toroidal extent for vertical ports (m)", "vpumpn": "number of high vacuum pumps", - "vsbn": "total flux swing available for burn (Wb)", + "vs_cs_pf_total_burn": "total flux swing available for burn (Wb)", "vs_plasma_burn_required": "V-s needed during flat-top (heat + burn times) (Wb)", "vsdum": "", "vs_pf_coils_total_burn": "flux swing from PF coils for burn (Wb)", @@ -18994,7 +18994,7 @@ "turns", "f_a_pf_coil_void", "f_a_cs_void", - "vsbn", + "vs_cs_pf_total_burn", "vs_pf_coils_total_burn", "vs_pf_coils_total_ramp", "vseft", diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index 34fd4e2cf2..89ee09e549 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1222,7 +1222,7 @@ def test_vsec(pfcoil, monkeypatch): """ monkeypatch.setattr(bv, "iohcl", 1) monkeypatch.setattr(pfv, "vs_pf_coils_total_ramp", 0) - monkeypatch.setattr(pfv, "vsbn", 0) + monkeypatch.setattr(pfv, "vs_cs_pf_total_burn", 0) monkeypatch.setattr(pfv, "n_cs_pf_coils", 7) monkeypatch.setattr(pfv, "vs_cs_burn", 0) monkeypatch.setattr( @@ -1960,7 +1960,7 @@ def test_vsec(pfcoil, monkeypatch): pfcoil.vsec() - assert_array_almost_equal(pfv.vsbn, vsbn_exp) + assert_array_almost_equal(pfv.vs_cs_pf_total_burn, vsbn_exp) assert_array_almost_equal(pfv.vsoh, vsoh_exp) diff --git a/tests/unit/test_pulse.py b/tests/unit/test_pulse.py index 3b0589954c..0e36a6c113 100644 --- a/tests/unit/test_pulse.py +++ b/tests/unit/test_pulse.py @@ -70,7 +70,7 @@ class BurnParam(NamedTuple): vs_plasma_ind_ramp: Any = None - vsbn: Any = None + vs_cs_pf_total_burn: Any = None vstot: Any = None @@ -1287,7 +1287,7 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): res_plasma=3.2347283861249307e-09, vs_plasma_res_ramp=59.392760827339345, vs_plasma_ind_ramp=284.23601098215397, - vsbn=0, + vs_cs_pf_total_burn=0, vstot=-718.91787876294552, plasma_current=17721306.969367817, inductive_current_fraction=0.60433999999999999, @@ -1304,7 +1304,7 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): vs_plasma_res_ramp=59.392760827339345, vs_plasma_ind_ramp=284.23601098215397, vstot=-718.9849676846776, - vsbn=-354.76231817639609, + vs_cs_pf_total_burn=-354.76231817639609, plasma_current=17721306.969367817, inductive_current_fraction=0.60433999999999999, csawth=1, @@ -1342,7 +1342,9 @@ def test_burn(burnparam, monkeypatch, initialise_error_module, pulse): monkeypatch.setattr(pfcoil_variables, "vstot", burnparam.vstot) - monkeypatch.setattr(pfcoil_variables, "vsbn", burnparam.vsbn) + monkeypatch.setattr( + pfcoil_variables, "vs_cs_pf_total_burn", burnparam.vs_cs_pf_total_burn + ) monkeypatch.setattr(physics_variables, "plasma_current", burnparam.plasma_current) From d237f23590c4f2a69955682c0edf4ff6dca4c2e3 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 11:27:17 +0000 Subject: [PATCH 61/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'vseft'=20to=20'v?= =?UTF-8?q?s=5Fpf=5Fcoils=5Ftotal=5Fpulse'=20for=20clarity=20and=20consist?= =?UTF-8?q?ency=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 6 ++++-- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_pfcoil.py | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index 9f4ba3a854..8e70d91433 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1636,7 +1636,9 @@ def vsec(self): pfv.vs_cs_pf_total_burn = pfv.vs_cs_burn + pfv.vs_pf_coils_total_burn pfv.vstot = pfv.vs_cs_pf_total_ramp + pfv.vs_cs_pf_total_burn - pfv.vseft = pfv.vs_pf_coils_total_ramp + pfv.vs_pf_coils_total_burn + pfv.vs_pf_coils_total_pulse = ( + pfv.vs_pf_coils_total_ramp + pfv.vs_pf_coils_total_burn + ) pfv.vsoh = pfv.vs_cs_burn + pfv.vs_cs_ramp def hoop_stress(self, r): @@ -2696,7 +2698,7 @@ def outvolt(self): op.write(self.outfile, "\t" * 3 + "start-up\t\t\t_burn\t\t\ttotal") op.write( self.outfile, - f"PF coils:\t\t{pfv.vs_pf_coils_total_ramp:.2f}\t\t\t\t{pfv.vs_pf_coils_total_burn:.2f}\t\t\t{pfv.vseft:.2f}", + f"PF coils:\t\t{pfv.vs_pf_coils_total_ramp:.2f}\t\t\t\t{pfv.vs_pf_coils_total_burn:.2f}\t\t\t{pfv.vs_pf_coils_total_pulse:.2f}", ) op.write( self.outfile, diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index aad652b5ce..07c18eb522 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -332,7 +332,7 @@ module pfcoil_variables real(dp) :: vs_pf_coils_total_ramp !! flux swing from PF coils for startup (Wb) - real(dp) :: vseft + real(dp) :: vs_pf_coils_total_pulse !! total flux swing from PF coils (Wb) real(dp) :: vsoh @@ -500,7 +500,7 @@ subroutine init_pfcoil_variables vs_cs_pf_total_burn = 0.0D0 vs_pf_coils_total_burn = 0.0D0 vs_pf_coils_total_ramp = 0.0D0 - vseft = 0.0D0 + vs_pf_coils_total_pulse = 0.0D0 vsoh = 0.0D0 vs_cs_burn = 0.0D0 vs_cs_ramp = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index dfbb769d06..20da060147 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7997,7 +7997,7 @@ "vsdum": 0.0, "vs_pf_coils_total_burn": 0.0, "vs_pf_coils_total_ramp": 0.0, - "vseft": 0.0, + "vs_pf_coils_total_pulse": 0.0, "vshift": 0.0, "vs_plasma_ind_ramp": 0.0, "vsoh": 0.0, @@ -11106,7 +11106,7 @@ "vsdum": "", "vs_pf_coils_total_burn": "flux swing from PF coils for burn (Wb)", "vs_pf_coils_total_ramp": "flux swing from PF coils for startup (Wb)", - "vseft": "total flux swing from PF coils (Wb)", + "vs_pf_coils_total_pulse": "total flux swing from PF coils (Wb)", "vshift": "plasma/device midplane vertical shift - single null", "vs_plasma_ind_ramp": "internal and external plasma inductance V-s (Wb)", "vsoh": "total flux swing from the central solenoid (Wb)", @@ -18997,7 +18997,7 @@ "vs_cs_pf_total_burn", "vs_pf_coils_total_burn", "vs_pf_coils_total_ramp", - "vseft", + "vs_pf_coils_total_pulse", "vsoh", "vs_cs_burn", "vs_cs_ramp", diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index 89ee09e549..2d6fb01e70 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1412,7 +1412,7 @@ def test_vsec(pfcoil, monkeypatch): ) monkeypatch.setattr(pfv, "vs_pf_coils_total_burn", 0) monkeypatch.setattr(pfv, "vs_cs_ramp", 0) - monkeypatch.setattr(pfv, "vseft", 0) + monkeypatch.setattr(pfv, "vs_pf_coils_total_pulse", 0) monkeypatch.setattr(pfv, "vsoh", 0) monkeypatch.setattr(pfv, "vs_cs_pf_total_ramp", 0) monkeypatch.setattr(pfv, "vstot", 0) From 8ade560afcbb661d501182a97b65fc7545f7a680 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 11:28:37 +0000 Subject: [PATCH 62/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'vsoh'=20to=20'vs?= =?UTF-8?q?=5Fcs=5Ftotal=5Fpulse'=20for=20clarity=20and=20consistency=20ac?= =?UTF-8?q?ross=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 4 ++-- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_pfcoil.py | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index 8e70d91433..315a96d652 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1639,7 +1639,7 @@ def vsec(self): pfv.vs_pf_coils_total_pulse = ( pfv.vs_pf_coils_total_ramp + pfv.vs_pf_coils_total_burn ) - pfv.vsoh = pfv.vs_cs_burn + pfv.vs_cs_ramp + pfv.vs_cs_total_pulse = pfv.vs_cs_burn + pfv.vs_cs_ramp def hoop_stress(self, r): """Calculation of hoop stress of central solenoid. @@ -2702,7 +2702,7 @@ def outvolt(self): ) op.write( self.outfile, - f"CS coil:\t\t{pfv.vs_cs_ramp:.2f}\t\t\t\t{pfv.vs_cs_burn:.2f}\t\t\t{pfv.vsoh:.2f}", + f"CS coil:\t\t{pfv.vs_cs_ramp:.2f}\t\t\t\t{pfv.vs_cs_burn:.2f}\t\t\t{pfv.vs_cs_total_pulse:.2f}", ) op.write( self.outfile, "\t" * 3 + "-" * 7 + "\t" * 4 + "-" * 7 + "\t" * 3 + "-" * 7 diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 07c18eb522..bf1062c7ba 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -335,7 +335,7 @@ module pfcoil_variables real(dp) :: vs_pf_coils_total_pulse !! total flux swing from PF coils (Wb) - real(dp) :: vsoh + real(dp) :: vs_cs_total_pulse !! total flux swing from the central solenoid (Wb) real(dp) :: vs_cs_burn @@ -501,7 +501,7 @@ subroutine init_pfcoil_variables vs_pf_coils_total_burn = 0.0D0 vs_pf_coils_total_ramp = 0.0D0 vs_pf_coils_total_pulse = 0.0D0 - vsoh = 0.0D0 + vs_cs_total_pulse = 0.0D0 vs_cs_burn = 0.0D0 vs_cs_ramp = 0.0D0 vs_cs_pf_total_ramp = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 20da060147..f5e884fc63 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8000,7 +8000,7 @@ "vs_pf_coils_total_pulse": 0.0, "vshift": 0.0, "vs_plasma_ind_ramp": 0.0, - "vsoh": 0.0, + "vs_cs_total_pulse": 0.0, "vs_cs_burn": 0.0, "vs_cs_ramp": 0.0, "vs_plasma_res_ramp": 0.0, @@ -11109,7 +11109,7 @@ "vs_pf_coils_total_pulse": "total flux swing from PF coils (Wb)", "vshift": "plasma/device midplane vertical shift - single null", "vs_plasma_ind_ramp": "internal and external plasma inductance V-s (Wb)", - "vsoh": "total flux swing from the central solenoid (Wb)", + "vs_cs_total_pulse": "total flux swing from the central solenoid (Wb)", "vs_cs_burn": "central solenoid flux swing for burn (Wb)", "vs_cs_ramp": "central solenoid flux swing for startup (Wb)", "vs_plasma_res_ramp": "resistive losses in startup V-s (Wb)", @@ -18998,7 +18998,7 @@ "vs_pf_coils_total_burn", "vs_pf_coils_total_ramp", "vs_pf_coils_total_pulse", - "vsoh", + "vs_cs_total_pulse", "vs_cs_burn", "vs_cs_ramp", "vs_cs_pf_total_ramp", diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index 2d6fb01e70..aca283a423 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1413,7 +1413,7 @@ def test_vsec(pfcoil, monkeypatch): monkeypatch.setattr(pfv, "vs_pf_coils_total_burn", 0) monkeypatch.setattr(pfv, "vs_cs_ramp", 0) monkeypatch.setattr(pfv, "vs_pf_coils_total_pulse", 0) - monkeypatch.setattr(pfv, "vsoh", 0) + monkeypatch.setattr(pfv, "vs_cs_total_pulse", 0) monkeypatch.setattr(pfv, "vs_cs_pf_total_ramp", 0) monkeypatch.setattr(pfv, "vstot", 0) monkeypatch.setattr(pfv, "n_pf_cs_plasma_circuits", 8) @@ -1961,7 +1961,7 @@ def test_vsec(pfcoil, monkeypatch): pfcoil.vsec() assert_array_almost_equal(pfv.vs_cs_pf_total_burn, vsbn_exp) - assert_array_almost_equal(pfv.vsoh, vsoh_exp) + assert_array_almost_equal(pfv.vs_cs_total_pulse, vsoh_exp) def test_hoop_stress(pfcoil, monkeypatch): From 4205866b895b5aba606a45939d8f1b01083b4cbc Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 12 Feb 2025 11:30:41 +0000 Subject: [PATCH 63/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'vstot'=20to=20'v?= =?UTF-8?q?s=5Fcs=5Fpf=5Ftotal=5Fpulse'=20for=20clarity=20and=20consistenc?= =?UTF-8?q?y=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 4 +- examples/data/large_tokamak_1_MFILE.DAT | 4 +- examples/data/large_tokamak_2_MFILE.DAT | 4 +- examples/data/large_tokamak_3_MFILE.DAT | 4 +- examples/data/large_tokamak_4_MFILE.DAT | 4 +- examples/data/scan_MFILE.DAT | 36 +++++------ process/io/mfile_comparison.py | 4 +- process/io/plot_proc.py | 4 +- process/pfcoil.py | 8 +-- process/pulse.py | 6 +- source/fortran/constraint_equations.f90 | 8 +-- source/fortran/pfcoil_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 4 +- .../data/large_tokamak_2_MFILE.DAT | 4 +- .../data/large_tokamak_3_MFILE.DAT | 4 +- .../data/large_tokamak_4_MFILE.DAT | 4 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +- tests/integration/data/scan_2D_MFILE.DAT | 60 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 36 +++++------ tests/integration/ref_dicts.json | 6 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +- tests/unit/test_pfcoil.py | 2 +- tests/unit/test_pulse.py | 10 ++-- tracking/tracking_data.py | 2 +- 24 files changed, 116 insertions(+), 114 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index eaf64116d0..5879744bea 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -553,7 +553,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5043E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 5.8939E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.8939E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8401E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.8571E+02 # Times # @@ -873,7 +873,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8915E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -5.9000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.9000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.8528E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.9610E-01 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 05c1c0d799..a527f008ca 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -551,7 +551,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 5.7728E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # @@ -868,7 +868,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -5.8000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 32361f69ee..e4538c4008 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -551,7 +551,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 5.7728E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # @@ -868,7 +868,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -5.8000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 49702e4062..2f0c17f6a6 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -551,7 +551,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 5.7728E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # @@ -868,7 +868,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -5.8000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 8f560cb8d8..bd3254b5fe 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -551,7 +551,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 5.7728E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # @@ -868,7 +868,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -5.8000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 1727aa134b..d792bcbbc3 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -406,7 +406,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.2115E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # @@ -704,7 +704,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.2115E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP @@ -1401,7 +1401,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.2115E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # @@ -1699,7 +1699,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.2115E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP @@ -2396,7 +2396,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.2115E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # @@ -2694,7 +2694,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.2115E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP @@ -3391,7 +3391,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.2115E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # @@ -3689,7 +3689,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.2115E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP @@ -4386,7 +4386,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.2115E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # @@ -4684,7 +4684,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.2115E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP @@ -5381,7 +5381,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.2115E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # @@ -5679,7 +5679,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.2115E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP @@ -6376,7 +6376,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.2115E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # @@ -6674,7 +6674,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.2115E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP @@ -7371,7 +7371,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.2115E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # @@ -7669,7 +7669,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.2115E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP @@ -8366,7 +8366,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.2115E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # @@ -8664,7 +8664,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.2115E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index a7744711e5..b6e705ebd1 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -65,7 +65,7 @@ "te", "dene", "hfact", - "vstot", + "vs_cs_pf_total_pulse", "bt", "bmaxtfrp", "tmarg", @@ -182,7 +182,7 @@ "p_plasma_loss_mw", "pdivt", "vssoft", - "vstot", + "vs_cs_pf_total_pulse", "t_burn", "bmaxtf", "iooic", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 45878bf424..085b14e1a2 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2638,7 +2638,7 @@ def plot_magnetics_info(axis, mfile_data, scan): (pf_info[1][0], pf_info[1][1], "MA"), (pf_info_3_a, pf_info_3_b, "MA"), (vssoft, "Startup flux swing", "Wb"), - ("vstot", "Available flux swing", "Wb"), + ("vs_cs_pf_total_pulse", "Available flux swing", "Wb"), (t_burn, "Burn time", "hrs"), ("", "", ""), (f"#TF coil type is {tftype}", "", ""), @@ -2664,7 +2664,7 @@ def plot_magnetics_info(axis, mfile_data, scan): (pf_info[1][0], pf_info[1][1], "MA"), (pf_info_3_a, pf_info_3_b, "MA"), (vssoft, "Startup flux swing", "Wb"), - ("vstot", "Available flux swing", "Wb"), + ("vs_cs_pf_total_pulse", "Available flux swing", "Wb"), (t_burn, "Burn time", "hrs"), ("", "", ""), (f"#TF coil type is {tftype}", "", ""), diff --git a/process/pfcoil.py b/process/pfcoil.py index 315a96d652..cd09ba64b2 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -1635,7 +1635,7 @@ def vsec(self): pfv.vs_cs_pf_total_burn = pfv.vs_cs_burn + pfv.vs_pf_coils_total_burn - pfv.vstot = pfv.vs_cs_pf_total_ramp + pfv.vs_cs_pf_total_burn + pfv.vs_cs_pf_total_pulse = pfv.vs_cs_pf_total_ramp + pfv.vs_cs_pf_total_burn pfv.vs_pf_coils_total_pulse = ( pfv.vs_pf_coils_total_ramp + pfv.vs_pf_coils_total_burn ) @@ -2709,15 +2709,15 @@ def outvolt(self): ) op.write( self.outfile, - f"Total:\t\t\t{pfv.vs_cs_pf_total_ramp:.2f}\t\t\t\t{pfv.vs_cs_pf_total_burn:.2f}\t\t\t{pfv.vstot:.2f}", + f"Total:\t\t\t{pfv.vs_cs_pf_total_ramp:.2f}\t\t\t\t{pfv.vs_cs_pf_total_burn:.2f}\t\t\t{pfv.vs_cs_pf_total_pulse:.2f}", ) op.oblnkl(self.outfile) op.ovarre( self.outfile, "Total volt-second consumption by coils (Wb)", - "(vstot)", - f"{pfv.vstot:.2}", + "(vs_cs_pf_total_pulse)", + f"{pfv.vs_cs_pf_total_pulse:.2}", "OP", ) diff --git a/process/pulse.py b/process/pulse.py index 96023f4d4d..687fd75561 100644 --- a/process/pulse.py +++ b/process/pulse.py @@ -166,7 +166,7 @@ def burn(self, output: bool): ) # Total volt-seconds available during flat-top (heat + burn) - # (Previously calculated as (abs(pfcoil_variables.vstot) - vssoft) ) + # (Previously calculated as (abs(pfcoil_variables.vs_cs_pf_total_pulse) - vssoft) ) vsmax = ( -pfcoil_variables.vs_cs_pf_total_burn @@ -201,8 +201,8 @@ def burn(self, output: bool): po.ovarre( self.outfile, "Total V-s capability of Central Solenoid/PF coils (Wb)", - "(abs(vstot))", - abs(pfcoil_variables.vstot), + "(abs(vs_cs_pf_total_pulse))", + abs(pfcoil_variables.vs_cs_pf_total_pulse), ) po.ovarre( self.outfile, diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index d248e088bb..51b005c59c 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -872,12 +872,12 @@ subroutine constraint_eqn_012(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! vs_plasma_total_required : input real : total V-s needed (Wb) - !! vs_plasma_total_required (lower limit) is positive; vstot (available) is negative + !! vs_plasma_total_required (lower limit) is positive; vs_cs_pf_total_pulse (available) is negative !! fvs : input real : f-value for flux-swing (V-s) requirement (STEADY STATE) - !! vstot : input real : total flux swing for pulse (Wb) + !! vs_cs_pf_total_pulse : input real : total flux swing for pulse (Wb) use physics_variables, only: vs_plasma_total_required use constraint_variables, only: fvs - use pfcoil_variables, only: vstot + use pfcoil_variables, only: vs_cs_pf_total_pulse implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -885,7 +885,7 @@ subroutine constraint_eqn_012(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 + fvs * vstot/vs_plasma_total_required + tmp_cc = 1.0D0 + fvs * vs_cs_pf_total_pulse/vs_plasma_total_required tmp_con = vs_plasma_total_required * (1.0D0 - tmp_cc) tmp_err = vs_plasma_total_required * tmp_cc tmp_symbol = '>' diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index bf1062c7ba..760bdbd648 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -347,7 +347,7 @@ module pfcoil_variables real(dp) :: vs_cs_pf_total_ramp !! total flux swing for startup (`constraint eqn 51` to enforce vs_cs_pf_total_ramp=vs_plasma_res_ramp+vs_plasma_ind_ramp) (Wb) - real(dp) :: vstot + real(dp) :: vs_cs_pf_total_pulse !! total flux swing for pulse (Wb) real(dp), dimension(ngc2,6) :: waves @@ -505,7 +505,7 @@ subroutine init_pfcoil_variables vs_cs_burn = 0.0D0 vs_cs_ramp = 0.0D0 vs_cs_pf_total_ramp = 0.0D0 - vstot = 0.0D0 + vs_cs_pf_total_pulse = 0.0D0 waves = 0.0D0 m_pf_coil_conductor_total = 0.0D0 m_pf_coil_structure_total = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 4d70329b6a..e61fe6eb1e 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -550,7 +550,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 5.7728E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # @@ -867,7 +867,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -5.8000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 4fac7a4e68..17019de2f0 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -551,7 +551,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 5.7728E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # @@ -868,7 +868,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -5.8000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index f89467d5e2..bc2cbe4876 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -551,7 +551,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 5.7728E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # @@ -868,7 +868,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -5.8000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index e0e0e1ea4e..6c43befd96 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -551,7 +551,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.6029E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 5.7728E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7728E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8601E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.7014E+02 # Times # @@ -868,7 +868,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.5207E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -5.8000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 4489d9c3fe..e2d667b411 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -548,7 +548,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5942E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 5.7129E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7129E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8516E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.6494E+02 # Times # @@ -871,7 +871,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.4358E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -5.7000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.7000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4577E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.3540E-01 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 9087419d8d..099075ad51 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -552,7 +552,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 5.9996E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.9996E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8403E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9617E+02 # Times # @@ -869,7 +869,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8645E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.0000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.0000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3618E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.8251E-01 OP @@ -1715,7 +1715,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.0647E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.0647E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8362E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0338E+02 # Times # @@ -2032,7 +2032,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9674E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.1000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3607E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.9479E-01 OP @@ -2878,7 +2878,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5112E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.1163E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.1163E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8300E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0929E+02 # Times # @@ -3195,7 +3195,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0546E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.1000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3661E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.0517E-01 OP @@ -4041,7 +4041,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.1107E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.1107E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8204E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0982E+02 # Times # @@ -4358,7 +4358,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0446E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.1000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3720E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.0952E-01 OP @@ -5204,7 +5204,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.0691E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.0691E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8323E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0430E+02 # Times # @@ -5521,7 +5521,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9622E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.1000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3460E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.9731E-01 OP @@ -6367,7 +6367,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 5.9993E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.9993E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8374E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9690E+02 # Times # @@ -6684,7 +6684,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8404E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.0000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.0000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3261E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.8444E-01 OP @@ -7530,7 +7530,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 5.9926E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.9926E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8284E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9732E+02 # Times # @@ -7847,7 +7847,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8266E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.0000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.0000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3271E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.8841E-01 OP @@ -8693,7 +8693,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.0503E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.0503E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8182E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0426E+02 # Times # @@ -9010,7 +9010,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9210E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.1000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3278E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.0105E-01 OP @@ -9856,7 +9856,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.1023E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.1023E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8018E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.1131E+02 # Times # @@ -10173,7 +10173,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0077E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.1000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3240E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.1463E-01 OP @@ -11019,7 +11019,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.1014E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.1014E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.7989E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.1157E+02 # Times # @@ -11336,7 +11336,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0009E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.1000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3251E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.1684E-01 OP @@ -12182,7 +12182,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.0509E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.0509E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8184E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0431E+02 # Times # @@ -12499,7 +12499,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9208E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.1000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3398E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.0290E-01 OP @@ -13345,7 +13345,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 5.9941E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.9941E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8291E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9741E+02 # Times # @@ -13662,7 +13662,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8389E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.0000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.0000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3669E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.9196E-01 OP @@ -14508,7 +14508,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 5.9920E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.9920E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8251E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.9768E+02 # Times # @@ -14825,7 +14825,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.8318E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.0000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.0000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3704E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.9463E-01 OP @@ -15671,7 +15671,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.0529E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.0529E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8208E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.0430E+02 # Times # @@ -15988,7 +15988,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.9246E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.1000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3585E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.0470E-01 OP @@ -16834,7 +16834,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5000E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.1139E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.1139E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8166E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 3.1092E+02 # Times # @@ -17151,7 +17151,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0197E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.1000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3499E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.1467E-01 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 2ecbec6197..2f220bcc5a 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -406,7 +406,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.2115E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # @@ -704,7 +704,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.2115E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP @@ -1401,7 +1401,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.2115E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # @@ -1699,7 +1699,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.2115E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP @@ -2396,7 +2396,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.2115E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # @@ -2694,7 +2694,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.2115E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP @@ -3391,7 +3391,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.2115E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # @@ -3689,7 +3689,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.2115E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP @@ -4386,7 +4386,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.2115E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # @@ -4684,7 +4684,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.2115E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP @@ -5381,7 +5381,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.2115E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # @@ -5679,7 +5679,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.2115E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP @@ -6376,7 +6376,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.2115E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # @@ -6674,7 +6674,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.2115E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP @@ -7371,7 +7371,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.2115E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # @@ -7669,7 +7669,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.2115E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP @@ -8366,7 +8366,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 5.1000E+01 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 4.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.2750E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 6.2115E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 6.2115E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 3.6189E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.3054E+02 # Times # @@ -8664,7 +8664,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 4.0453E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -6.2115E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index f5e884fc63..8f2f92c795 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8006,7 +8006,7 @@ "vs_plasma_res_ramp": 0.0, "vs_plasma_total_required": 0.0, "vs_cs_pf_total_ramp": 0.0, - "vstot": 0.0, + "vs_cs_pf_total_pulse": 0.0, "vte1_": 18755328.0, "vtfkv": 0.0, "vtfskv": 0.0, @@ -11115,7 +11115,7 @@ "vs_plasma_res_ramp": "resistive losses in startup V-s (Wb)", "vs_plasma_total_required": "total V-s needed (Wb)", "vs_cs_pf_total_ramp": "total flux swing for startup (`constraint eqn 51` to enforce vs_cs_pf_total_ramp=vs_plasma_res_ramp+vs_plasma_ind_ramp) (Wb)", - "vstot": "total flux swing for pulse (Wb)", + "vs_cs_pf_total_pulse": "total flux swing for pulse (Wb)", "vte1_": "", "vtfkv": "TF coil voltage for resistive coil including bus (kV)", "vtfskv": "voltage across a TF coil during quench (kV)", @@ -19002,7 +19002,7 @@ "vs_cs_burn", "vs_cs_ramp", "vs_cs_pf_total_ramp", - "vstot", + "vs_cs_pf_total_pulse", "waves", "m_pf_coil_conductor_total", "m_pf_coil_structure_total", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 669deb6048..b2d8167e68 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -548,7 +548,7 @@ Maximum_allowable_ECRH_power_(MW)_______________________________________ (pinjalw)_____________________ 2.0000E+02 ECH_wall_plug_efficiency________________________________________________ (etaech)______________________ 5.0000E-01 ECH_wall_plug_power_(MW)________________________________________________ (echwpow)_____________________ 1.5942E+02 OP - Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vstot))__________________ 5.7129E+02 + Total_V-s_capability_of_Central_Solenoid/PF_coils_(Wb)__________________ (abs(vs_cs_pf_total_pulse))__________________ 5.7129E+02 Required_volt-seconds_during_start-up_(Wb)______________________________ (vssoft)______________________ 2.8516E+02 Available_volt-seconds_during_burn_(Wb)_________________________________ (vsmax)_______________________ 2.6494E+02 # Times # @@ -871,7 +871,7 @@ Sum_of_squares_of_residuals_____________________________________________ (ssq0)________________________ 3.4358E-04 OP Smoothing_parameter_____________________________________________________ (alfapf)______________________ 5.0000E-10 # Volt Second Consumption # - Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vstot)_______________________ -5.7000E+02 OP + Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.7000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4577E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.3540E-01 OP diff --git a/tests/unit/test_pfcoil.py b/tests/unit/test_pfcoil.py index aca283a423..e90474260b 100644 --- a/tests/unit/test_pfcoil.py +++ b/tests/unit/test_pfcoil.py @@ -1415,7 +1415,7 @@ def test_vsec(pfcoil, monkeypatch): monkeypatch.setattr(pfv, "vs_pf_coils_total_pulse", 0) monkeypatch.setattr(pfv, "vs_cs_total_pulse", 0) monkeypatch.setattr(pfv, "vs_cs_pf_total_ramp", 0) - monkeypatch.setattr(pfv, "vstot", 0) + monkeypatch.setattr(pfv, "vs_cs_pf_total_pulse", 0) monkeypatch.setattr(pfv, "n_pf_cs_plasma_circuits", 8) monkeypatch.setattr( pfv, diff --git a/tests/unit/test_pulse.py b/tests/unit/test_pulse.py index 0e36a6c113..c0a445ef2d 100644 --- a/tests/unit/test_pulse.py +++ b/tests/unit/test_pulse.py @@ -72,7 +72,7 @@ class BurnParam(NamedTuple): vs_cs_pf_total_burn: Any = None - vstot: Any = None + vs_cs_pf_total_pulse: Any = None plasma_current: Any = None @@ -1288,7 +1288,7 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): vs_plasma_res_ramp=59.392760827339345, vs_plasma_ind_ramp=284.23601098215397, vs_cs_pf_total_burn=0, - vstot=-718.91787876294552, + vs_cs_pf_total_pulse=-718.91787876294552, plasma_current=17721306.969367817, inductive_current_fraction=0.60433999999999999, csawth=1, @@ -1303,7 +1303,7 @@ def test_tohswg(tohswgparam, monkeypatch, pulse): res_plasma=3.2347283861249307e-09, vs_plasma_res_ramp=59.392760827339345, vs_plasma_ind_ramp=284.23601098215397, - vstot=-718.9849676846776, + vs_cs_pf_total_pulse=-718.9849676846776, vs_cs_pf_total_burn=-354.76231817639609, plasma_current=17721306.969367817, inductive_current_fraction=0.60433999999999999, @@ -1340,7 +1340,9 @@ def test_burn(burnparam, monkeypatch, initialise_error_module, pulse): physics_variables, "vs_plasma_ind_ramp", burnparam.vs_plasma_ind_ramp ) - monkeypatch.setattr(pfcoil_variables, "vstot", burnparam.vstot) + monkeypatch.setattr( + pfcoil_variables, "vs_cs_pf_total_pulse", burnparam.vs_cs_pf_total_pulse + ) monkeypatch.setattr( pfcoil_variables, "vs_cs_pf_total_burn", burnparam.vs_cs_pf_total_burn diff --git a/tracking/tracking_data.py b/tracking/tracking_data.py index bec6b7e29a..b4798e8c39 100644 --- a/tracking/tracking_data.py +++ b/tracking/tracking_data.py @@ -153,7 +153,7 @@ class ProcessTracker: "tftmp", "n_tf_coils", "bmaxtf", - "vstot", + "vs_cs_pf_total_pulse", "nd_ions_total", "t_burn", "divlife", From 8fb1777e71bb76749e309e1c4e14713e2b0a980a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 19 Feb 2025 13:56:59 +0000 Subject: [PATCH 64/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'fcohbof'=20to=20?= =?UTF-8?q?'f=5Fj=5Fcs=5Fstart=5Fend=5Fflat=5Ftop'=20for=20clarity=20and?= =?UTF-8?q?=20consistency=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/io/obsolete_vars.py | 2 +- process/pfcoil.py | 26 ++++++++-------- source/fortran/pfcoil_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/integration/test_pfcoil_int.py | 4 +-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- 19 files changed, 65 insertions(+), 65 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 5879744bea..38cf86dc75 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -876,7 +876,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.9000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.8528E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.9610E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.9610E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index a527f008ca..20d7fb7b36 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -871,7 +871,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index e4538c4008..4a71becf61 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -871,7 +871,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 2f0c17f6a6..6b6cf4a935 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -871,7 +871,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index bd3254b5fe..eaeacbb135 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -871,7 +871,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index d792bcbbc3..804f25bd28 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -707,7 +707,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 @@ -1702,7 +1702,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 @@ -2697,7 +2697,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 @@ -3692,7 +3692,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 @@ -4687,7 +4687,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 @@ -5682,7 +5682,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 @@ -6677,7 +6677,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 @@ -7672,7 +7672,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 @@ -8667,7 +8667,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 734b2b73bd..3a01de38f2 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -104,7 +104,7 @@ "bcylth": None, "itfmod": None, "jcrit_model": None, - "fcohbof": None, + "f_j_cs_start_end_flat_top": None, "fvolbi": "fhole", "fvolbo": "fhole", "fvolcry": None, diff --git a/process/pfcoil.py b/process/pfcoil.py index cd09ba64b2..8e24dbe4ea 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -483,13 +483,13 @@ def pfcoil(self): ) dics = csflux / ddics - pfv.fcohbof = ((-ioheof * pfv.fcohbop) + dics) / ioheof - pfv.fcohbof = min(pfv.fcohbof, 1.0e0) # constrains abs(fcohbof) <= 1.0; - pfv.fcohbof = max(pfv.fcohbof, -1.0e0) # probably un-necessary + pfv.f_j_cs_start_end_flat_top = ((-ioheof * pfv.fcohbop) + dics) / ioheof + pfv.f_j_cs_start_end_flat_top = min(pfv.f_j_cs_start_end_flat_top, 1.0e0) # constrains abs(f_j_cs_start_end_flat_top) <= 1.0; + pfv.f_j_cs_start_end_flat_top = max(pfv.f_j_cs_start_end_flat_top, -1.0e0) # probably un-necessary else: dics = 0.0e0 - pfv.fcohbof = 1.0e0 + pfv.f_j_cs_start_end_flat_top = 1.0e0 eh.report_error(71) # Split groups of coils into one set containing ncl coils @@ -516,7 +516,7 @@ def pfcoil(self): # Beginning of flat-top: t = tv.t_precharge+tv.t_current_ramp_up pfv.c_pf_cs_coil_flat_top_ma[ncl] = 1.0e-6 * ( - pf.ccls[nng] - (pf.ccl0[nng] * pfv.fcohbof / pfv.fcohbop) + pf.ccls[nng] - (pf.ccl0[nng] * pfv.f_j_cs_start_end_flat_top / pfv.fcohbop) ) # End of flat-top: t = tv.t_precharge+tv.t_current_ramp_up+tv.t_fusion_ramp+tv.t_burn @@ -529,7 +529,7 @@ def pfcoil(self): # Current in Central Solenoid as a function of time # N.B. If the Central Solenoid is not present then ioheof is zero. pfv.c_pf_cs_coil_pulse_start_ma[ncl] = -1.0e-6 * ioheof * pfv.fcohbop - pfv.c_pf_cs_coil_flat_top_ma[ncl] = 1.0e-6 * ioheof * pfv.fcohbof + pfv.c_pf_cs_coil_flat_top_ma[ncl] = 1.0e-6 * ioheof * pfv.f_j_cs_start_end_flat_top pfv.c_pf_cs_coil_pulse_end_ma[ncl] = 1.0e-6 * ioheof # Set up coil current waveforms, normalised to the peak current in @@ -819,7 +819,7 @@ def pfcoil(self): pfv.n_pf_coil_turns[pfv.n_cs_pf_coils] = 1.0e0 # Generate coil currents as a function of time using - # user-provided waveforms etc. (c_pf_coil_turn_peak_input, fcohbop, fcohbof) + # user-provided waveforms etc. (c_pf_coil_turn_peak_input, fcohbop, f_j_cs_start_end_flat_top) for k in range(6): # time points for i in range(pfv.n_pf_cs_plasma_circuits - 1): pfv.c_pf_coil_turn[i, k] = pfv.waves[i, k] * math.copysign( @@ -2775,8 +2775,8 @@ def outvolt(self): ( f"{k}\t\t\t{pfv.c_pf_coil_turn[k, 0] * pfv.n_pf_coil_turns[k]:.3e}\t" f"{pfv.c_pf_coil_turn[k, 1] * pfv.n_pf_coil_turns[k]:.3e}\t" - f"{-pfv.c_pf_coil_turn[k, 1] * pfv.n_pf_coil_turns[k] * (pfv.fcohbof / pfv.fcohbop):.3e}\t" - f"{-pfv.c_pf_coil_turn[k, 1] * pfv.n_pf_coil_turns[k] * (pfv.fcohbof / pfv.fcohbop):.3e}\t" + f"{-pfv.c_pf_coil_turn[k, 1] * pfv.n_pf_coil_turns[k] * (pfv.f_j_cs_start_end_flat_top / pfv.fcohbop):.3e}\t" + f"{-pfv.c_pf_coil_turn[k, 1] * pfv.n_pf_coil_turns[k] * (pfv.f_j_cs_start_end_flat_top / pfv.fcohbop):.3e}\t" f"{-pfv.c_pf_coil_turn[k, 1] * pfv.n_pf_coil_turns[k] * (1.0e0 / pfv.fcohbop):.3e}\t" f"{pfv.c_pf_coil_turn[k, 5] * pfv.n_pf_coil_turns[k]:.3e}" ), @@ -2789,8 +2789,8 @@ def outvolt(self): self.outfile, ( f"{k}\t\t\t{0.0:.3e}\t{0.0:.3e}\t" - f"{(pfv.c_pf_coil_turn[k, 2] + pfv.c_pf_coil_turn[k, 1] * pfv.fcohbof / pfv.fcohbop) * pfv.n_pf_coil_turns[k]:.3e}\t" - f"{(pfv.c_pf_coil_turn[k, 3] + pfv.c_pf_coil_turn[k, 1] * pfv.fcohbof / pfv.fcohbop) * pfv.n_pf_coil_turns[k]:.3e}\t" + f"{(pfv.c_pf_coil_turn[k, 2] + pfv.c_pf_coil_turn[k, 1] * pfv.f_j_cs_start_end_flat_top / pfv.fcohbop) * pfv.n_pf_coil_turns[k]:.3e}\t" + f"{(pfv.c_pf_coil_turn[k, 3] + pfv.c_pf_coil_turn[k, 1] * pfv.f_j_cs_start_end_flat_top / pfv.fcohbop) * pfv.n_pf_coil_turns[k]:.3e}\t" f"{(pfv.c_pf_coil_turn[k, 4] + pfv.c_pf_coil_turn[k, 1] * 1.0e0 / pfv.fcohbop) * pfv.n_pf_coil_turns[k]:.3e}\t" "0.0e0" ), @@ -2806,8 +2806,8 @@ def outvolt(self): op.ovarre( self.outfile, "Ratio of central solenoid current at beginning of Flat-top / end of flat-top", - "(fcohbof)", - pfv.fcohbof, + "(f_j_cs_start_end_flat_top)", + pfv.f_j_cs_start_end_flat_top, "OP ", ) diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 760bdbd648..fc8a0dfce1 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -98,7 +98,7 @@ module pfcoil_variables real(dp) :: etapsu !! Efficiency of transfer of PF stored energy into or out of storage. - real(dp) :: fcohbof + real(dp) :: f_j_cs_start_end_flat_top !! ratio of central solenoid overall current density at beginning of flat-top / end of flat-top real(dp) :: fcohbop @@ -438,7 +438,7 @@ subroutine init_pfcoil_variables c_pf_cs_coil_flat_top_ma = 0.0D0 c_pf_cs_coil_pulse_end_ma = 0.0D0 etapsu = 0.9D0 - fcohbof = 0.0D0 + f_j_cs_start_end_flat_top = 0.0D0 fcohbop = 0.9D0 fcuohsu = 0.7D0 fcupfsu = 0.69D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index e61fe6eb1e..70ebea1359 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -870,7 +870,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 17019de2f0..1483023c72 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -871,7 +871,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index bc2cbe4876..ac647254c4 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -871,7 +871,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 6c43befd96..178e83c3ee 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -871,7 +871,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.4083E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index e2d667b411..18d99279fc 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -874,7 +874,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.7000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4577E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.3540E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.3540E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 099075ad51..a8a6ecda23 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -872,7 +872,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.0000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3618E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.8251E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.8251E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 @@ -2035,7 +2035,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3607E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.9479E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.9479E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 @@ -3198,7 +3198,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3661E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.0517E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -2.0517E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 @@ -4361,7 +4361,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3720E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.0952E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -2.0952E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 @@ -5524,7 +5524,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3460E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.9731E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.9731E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 @@ -6687,7 +6687,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.0000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3261E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.8444E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.8444E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 @@ -7850,7 +7850,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.0000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3271E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.8841E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.8841E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 @@ -9013,7 +9013,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3278E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.0105E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -2.0105E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 @@ -10176,7 +10176,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3240E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.1463E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -2.1463E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 @@ -11339,7 +11339,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3251E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.1684E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -2.1684E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 @@ -12502,7 +12502,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3398E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.0290E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -2.0290E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 @@ -13665,7 +13665,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.0000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3669E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.9196E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.9196E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 @@ -14828,7 +14828,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.0000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3704E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.9463E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.9463E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 @@ -15991,7 +15991,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3585E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.0470E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -2.0470E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 @@ -17154,7 +17154,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3499E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -2.1467E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -2.1467E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 2f220bcc5a..254a3e258e 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -707,7 +707,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 @@ -1702,7 +1702,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 @@ -2697,7 +2697,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 @@ -3692,7 +3692,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 @@ -4687,7 +4687,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 @@ -5682,7 +5682,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 @@ -6677,7 +6677,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 @@ -7672,7 +7672,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 @@ -8667,7 +8667,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ 4.6908E-02 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_01_-_Time_point_01_(A)_______________________________________ (pfc01t01)____________________ 0.0000E+00 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 8f2f92c795..a0ed681124 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1893,7 +1893,7 @@ "fcap0cp": 1.08, "fcdfuel": 0.1, "fce1_": "wce1_/(2*pi)", - "fcohbof": 0.0, + "f_j_cs_start_end_flat_top": 0.0, "fcohbop": 0.9, "fcontng": 0.195, "fcoolcp": 0.3, @@ -9509,7 +9509,7 @@ "fcap0cp": "average cost of money for replaceable components assuming lead time for these of two years", "fcdfuel": "fraction of current drive cost treated as fuel (if `ifueltyp = 1`)", "fce1_": "", - "fcohbof": "ratio of central solenoid overall current density at beginning of flat-top / end of flat-top", + "f_j_cs_start_end_flat_top": "ratio of central solenoid overall current density at beginning of flat-top / end of flat-top", "fcohbop": "ratio of central solenoid overall current density at beginning of pulse / end of flat-top\n (`iteration variable 41`)", "fcontng": "project contingency factor", "fcoolcp": "coolant fraction of TF coil inboard legs (`iteration variable 23`)", @@ -18943,7 +18943,7 @@ "c_pf_cs_coil_flat_top_ma", "c_pf_cs_coil_pulse_end_ma", "etapsu", - "fcohbof", + "f_j_cs_start_end_flat_top", "fcohbop", "fcuohsu", "fcupfsu", diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index 53d5e1802e..b1153a9b28 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -80,7 +80,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "c_pf_cs_coil_pulse_start_ma", np.full(22, 0.0)) monkeypatch.setattr(pfv, "routr", 1.5) monkeypatch.setattr(pfv, "c_pf_cs_coils_peak_ma", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "fcohbof", 2.654e-1) + monkeypatch.setattr(pfv, "f_j_cs_start_end_flat_top", 2.654e-1) monkeypatch.setattr(pfv, "rpf2", -1.825) monkeypatch.setattr(pfv, "nfxfh", 7) monkeypatch.setattr(pfv, "b_pf_coil_peak", np.full(22, 0.0)) @@ -102,7 +102,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "sigpfcalw", 5.0e2) monkeypatch.setattr(pfv, "j_cs_flat_top_end", 1.6932e7) monkeypatch.setattr(pfv, "z_pf_coil_upper", np.full(22, 0.0)) - monkeypatch.setattr(pfv, "fcohbof", 2.654e-1) + monkeypatch.setattr(pfv, "f_j_cs_start_end_flat_top", 2.654e-1) monkeypatch.setattr(pfv, "r_pf_coil_inner", np.full(22, 0.0)) monkeypatch.setattr(pfv, "r_pf_coil_outer", np.full(22, 0.0)) monkeypatch.setattr(pfv, "i_pf_superconductor", 3) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index b2d8167e68..d2bff34ea8 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -874,7 +874,7 @@ Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.7000E+02 OP # Waveforms # Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4577E-01 ITV - Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (fcohbof)_____________________ -1.3540E-01 OP + Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.3540E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 PF_Circuit_0_Time_point_0_(A)___________________________________________ (pfc0t0)______________________ 0.0000E+00 From 96f0116cac638f5cb91c345c0a6a8fd84851580c Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 19 Feb 2025 13:59:23 +0000 Subject: [PATCH 65/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'fcohbop'=20to=20?= =?UTF-8?q?'f=5Fj=5Fcs=5Fstart=5Fpulse=5Fend=5Fflat=5Ftop'=20for=20clarity?= =?UTF-8?q?=20and=20consistency=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/central-solenoid.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 12 +- examples/data/large_tokamak_1_MFILE.DAT | 12 +- examples/data/large_tokamak_2_MFILE.DAT | 12 +- examples/data/large_tokamak_3_MFILE.DAT | 12 +- examples/data/large_tokamak_4_MFILE.DAT | 12 +- examples/data/large_tokamak_IN.DAT | 4 +- examples/data/mfile_to_csv_vars.json | 2 +- examples/data/scan_MFILE.DAT | 78 +++++------ examples/data/scan_example_file_IN.DAT | 4 +- process/io/mfile_to_csv_vars.json | 2 +- process/pfcoil.py | 68 ++++++---- scripts/create_dicts_config.py | 2 +- source/fortran/input.f90 | 6 +- source/fortran/iteration_variables.f90 | 12 +- source/fortran/numerics.f90 | 2 +- source/fortran/pfcoil_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 12 +- .../data/large_tokamak_2_MFILE.DAT | 12 +- .../data/large_tokamak_3_MFILE.DAT | 12 +- .../data/large_tokamak_4_MFILE.DAT | 12 +- tests/integration/data/large_tokamak_IN.DAT | 4 +- .../integration/data/large_tokamak_MFILE.DAT | 12 +- .../data/large_tokamak_once_through.IN.DAT | 4 +- tests/integration/data/ref_IN.DAT | 6 +- tests/integration/data/scan_2D_MFILE.DAT | 124 +++++++++--------- tests/integration/data/scan_MFILE.DAT | 78 +++++------ .../data/uncertainties_nonopt_ref_IN.DAT | 6 +- .../integration/data/uncertainties_ref_IN.DAT | 6 +- tests/integration/ref_dicts.json | 26 ++-- tests/integration/test_pfcoil_int.py | 15 +-- .../input_files/large_tokamak.IN.DAT | 4 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 4 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_IN.DAT | 4 +- tests/unit/data/large_tokamak_MFILE.DAT | 12 +- 37 files changed, 304 insertions(+), 299 deletions(-) diff --git a/documentation/proc-pages/eng-models/central-solenoid.md b/documentation/proc-pages/eng-models/central-solenoid.md index b31a0746fa..87964276cc 100644 --- a/documentation/proc-pages/eng-models/central-solenoid.md +++ b/documentation/proc-pages/eng-models/central-solenoid.md @@ -149,7 +149,7 @@ The central solenoid pre-compression structure is included in the model if and o The absolute value of the central solenoid current density at the end-of-flat-top ('EOF'), `j_cs_flat_top_end`, is specified by the user, and can be used as an iteration variable (no. 37). The current density at the beginning-of-pulse ('BOP' - See Figure 1) is specified as a (positive) fraction of `j_cs_flat_top_end` -using `fcohbop` (iteration variable no. 41). The current density in the CS at all other times is +using `f_j_cs_start_pulse_end_flat_top` (iteration variable no. 41). The current density in the CS at all other times is calculated by taking into account the flux swing necessary to initiate and maintain plasma current. The current density in the central solenoid can be limited at BOP and at EOF. To limit the current diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 38cf86dc75..02e170d3c5 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -61,9 +61,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.6968E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 9.4947E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.6925E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.8528E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0948E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.8527E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.8528E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0948E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.8527E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.3084E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.1244E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.3057E-01 @@ -875,7 +875,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.9000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.8528E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.8528E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.9610E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -1306,10 +1306,10 @@ fjohc = 0.6 *--------------------------------------------------* icc = 27 ixc = 39 * fjohc0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top boundu(39) = 1.0 fjohc0 = 0.6 -fcohbop = 0.9 +f_j_cs_start_pulse_end_flat_top = 0.9 * I_op/I_Crit TF coil limit * *---------------------------* diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 20d7fb7b36..10e487f9b1 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -62,9 +62,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.4190E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 9.0316E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.4144E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.4380E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0487E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.4374E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.4380E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0487E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.4374E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.1737E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.1036E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.1709E-01 @@ -870,7 +870,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -1301,10 +1301,10 @@ fjohc = 0.6 *--------------------------------------------------* icc = 27 ixc = 39 * fjohc0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top boundu(39) = 1.0 fjohc0 = 0.6 -fcohbop = 0.9 +f_j_cs_start_pulse_end_flat_top = 0.9 * I_op/I_Crit TF coil limit * *---------------------------* diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 4a71becf61..847e86c95c 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -62,9 +62,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.4190E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 9.0316E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.4144E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.4380E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0487E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.4374E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.4380E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0487E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.4374E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.1737E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.1036E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.1709E-01 @@ -870,7 +870,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -1301,10 +1301,10 @@ fjohc = 0.6 *--------------------------------------------------* icc = 27 ixc = 39 * fjohc0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top boundu(39) = 1.0 fjohc0 = 0.6 -fcohbop = 0.9 +f_j_cs_start_pulse_end_flat_top = 0.9 * I_op/I_Crit TF coil limit * *---------------------------* diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 6b6cf4a935..396c1613e0 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -62,9 +62,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.4190E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 9.0316E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.4144E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.4380E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0487E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.4374E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.4380E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0487E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.4374E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.1737E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.1036E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 6.1709E-01 @@ -870,7 +870,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -1301,10 +1301,10 @@ fjohc = 0.6 *--------------------------------------------------* icc = 27 ixc = 39 * fjohc0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top boundu(39) = 1.0 fjohc0 = 0.6 -fcohbop = 0.9 +f_j_cs_start_pulse_end_flat_top = 0.9 * I_op/I_Crit TF coil limit * *---------------------------* diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index eaeacbb135..a6bdf2d151 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -62,9 +62,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.4190E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 9.0316E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.4144E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.4380E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0487E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.8374E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.4380E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0487E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.8374E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.1737E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.1036E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.1709E-01 @@ -870,7 +870,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -1301,10 +1301,10 @@ fjohc = 0.6 *--------------------------------------------------* icc = 27 ixc = 39 * fjohc0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top boundu(39) = 1.0 fjohc0 = 0.6 -fcohbop = 0.9 +f_j_cs_start_pulse_end_flat_top = 0.9 * I_op/I_Crit TF coil limit * *---------------------------* diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 73f40a6b3c..95029ac392 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -113,10 +113,10 @@ fjohc = 0.6 *--------------------------------------------------* icc = 27 ixc = 39 * fjohc0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top boundu(39) = 1.0 fjohc0 = 0.6 -fcohbop = 0.9 +f_j_cs_start_pulse_end_flat_top = 0.9 * I_op/I_Crit TF coil limit * *---------------------------* diff --git a/examples/data/mfile_to_csv_vars.json b/examples/data/mfile_to_csv_vars.json index dc589edaef..1e089ba71c 100644 --- a/examples/data/mfile_to_csv_vars.json +++ b/examples/data/mfile_to_csv_vars.json @@ -8,7 +8,7 @@ "alstroh", "sig_tf_wp_max", "thwcndut", - "fcohbop", + "f_j_cs_start_pulse_end_flat_top", "alstroh", "rmajor", "dr_tf_inboard", diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 804f25bd28..916cf5431a 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -68,9 +68,9 @@ fjohc0__________________________________________________________________ (itvar015)____________________ 1.3899E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm015)______________________ 2.5776E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar015)___________________ 1.3813E-01 - fcohbop_________________________________________________________________ (itvar016)____________________ 1.0000E+00 - fcohbop_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0732E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar016)____________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0732E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 gapoh___________________________________________________________________ (itvar017)____________________ 5.0000E-02 gapoh_(final_value/initial_value)_______________________________________ (xcm017)______________________ 1.0000E+00 gapoh_(range_normalised)________________________________________________ (nitvar017)___________________ 0.0000E+00 @@ -706,7 +706,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -1063,9 +1063,9 @@ fjohc0__________________________________________________________________ (itvar015)____________________ 1.3899E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar015)___________________ 1.3813E-01 - fcohbop_________________________________________________________________ (itvar016)____________________ 1.0000E+00 - fcohbop_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar016)____________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 gapoh___________________________________________________________________ (itvar017)____________________ 5.0000E-02 gapoh_(final_value/initial_value)_______________________________________ (xcm017)______________________ 1.0000E+00 gapoh_(range_normalised)________________________________________________ (nitvar017)___________________ 0.0000E+00 @@ -1701,7 +1701,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -2058,9 +2058,9 @@ fjohc0__________________________________________________________________ (itvar015)____________________ 1.3899E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar015)___________________ 1.3813E-01 - fcohbop_________________________________________________________________ (itvar016)____________________ 1.0000E+00 - fcohbop_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar016)____________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 gapoh___________________________________________________________________ (itvar017)____________________ 5.0000E-02 gapoh_(final_value/initial_value)_______________________________________ (xcm017)______________________ 1.0000E+00 gapoh_(range_normalised)________________________________________________ (nitvar017)___________________ 0.0000E+00 @@ -2696,7 +2696,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -3053,9 +3053,9 @@ fjohc0__________________________________________________________________ (itvar015)____________________ 1.3899E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar015)___________________ 1.3813E-01 - fcohbop_________________________________________________________________ (itvar016)____________________ 1.0000E+00 - fcohbop_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar016)____________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 gapoh___________________________________________________________________ (itvar017)____________________ 5.0000E-02 gapoh_(final_value/initial_value)_______________________________________ (xcm017)______________________ 1.0000E+00 gapoh_(range_normalised)________________________________________________ (nitvar017)___________________ 0.0000E+00 @@ -3691,7 +3691,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -4048,9 +4048,9 @@ fjohc0__________________________________________________________________ (itvar015)____________________ 1.3899E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar015)___________________ 1.3813E-01 - fcohbop_________________________________________________________________ (itvar016)____________________ 1.0000E+00 - fcohbop_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar016)____________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 gapoh___________________________________________________________________ (itvar017)____________________ 5.0000E-02 gapoh_(final_value/initial_value)_______________________________________ (xcm017)______________________ 1.0000E+00 gapoh_(range_normalised)________________________________________________ (nitvar017)___________________ 0.0000E+00 @@ -4686,7 +4686,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -5043,9 +5043,9 @@ fjohc0__________________________________________________________________ (itvar015)____________________ 1.3899E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar015)___________________ 1.3813E-01 - fcohbop_________________________________________________________________ (itvar016)____________________ 1.0000E+00 - fcohbop_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar016)____________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 gapoh___________________________________________________________________ (itvar017)____________________ 5.0000E-02 gapoh_(final_value/initial_value)_______________________________________ (xcm017)______________________ 1.0000E+00 gapoh_(range_normalised)________________________________________________ (nitvar017)___________________ 0.0000E+00 @@ -5681,7 +5681,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -6038,9 +6038,9 @@ fjohc0__________________________________________________________________ (itvar015)____________________ 1.3899E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar015)___________________ 1.3813E-01 - fcohbop_________________________________________________________________ (itvar016)____________________ 1.0000E+00 - fcohbop_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar016)____________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 gapoh___________________________________________________________________ (itvar017)____________________ 5.0000E-02 gapoh_(final_value/initial_value)_______________________________________ (xcm017)______________________ 1.0000E+00 gapoh_(range_normalised)________________________________________________ (nitvar017)___________________ 0.0000E+00 @@ -6676,7 +6676,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -7033,9 +7033,9 @@ fjohc0__________________________________________________________________ (itvar015)____________________ 1.3899E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar015)___________________ 1.3813E-01 - fcohbop_________________________________________________________________ (itvar016)____________________ 1.0000E+00 - fcohbop_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar016)____________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 gapoh___________________________________________________________________ (itvar017)____________________ 5.0000E-02 gapoh_(final_value/initial_value)_______________________________________ (xcm017)______________________ 1.0000E+00 gapoh_(range_normalised)________________________________________________ (nitvar017)___________________ 0.0000E+00 @@ -7671,7 +7671,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -8028,9 +8028,9 @@ fjohc0__________________________________________________________________ (itvar015)____________________ 1.3899E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar015)___________________ 1.3813E-01 - fcohbop_________________________________________________________________ (itvar016)____________________ 1.0000E+00 - fcohbop_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar016)____________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 gapoh___________________________________________________________________ (itvar017)____________________ 5.0000E-02 gapoh_(final_value/initial_value)_______________________________________ (xcm017)______________________ 1.0000E+00 gapoh_(range_normalised)________________________________________________ (nitvar017)___________________ 0.0000E+00 @@ -8666,7 +8666,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -9029,7 +9029,7 @@ ixc = 38 * fjohc boundu(38) = 1.0 ixc = 39 * fjohc0 boundu(39) = 1.0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top ixc = 42 * dr_cs_tf_gap boundl(42) = 0.05 boundu(42) = 0.1 @@ -9204,7 +9204,7 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon j_cs_flat_top_end = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) c_pf_coil_turn_peak_input = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) -fcohbop = 0.9362 * Ratio of central solenoid overall current density at +f_j_cs_start_pulse_end_flat_top = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j @@ -9329,7 +9329,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) j_cs_flat_top_end = 2.0726E+07 fjohc = 5.7941E-01 fjohc0 = 5.3923E-01 - fcohbop = 9.3176E-01 + f_j_cs_start_pulse_end_flat_top = 9.3176E-01 dr_cs_tf_gap = 5.0000E-02 fvsbrnni = 3.9566E-01 fstrcase = 1.0000E+00 diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 793aa7b2e1..cf10665c88 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -113,10 +113,10 @@ fjohc = 0.6 *--------------------------------------------------* icc = 27 ixc = 39 * fjohc0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top boundu(39) = 1.0 fjohc0 = 0.6 -fcohbop = 0.9 +f_j_cs_start_pulse_end_flat_top = 0.9 * I_op/I_Crit TF coil limit * *---------------------------* diff --git a/process/io/mfile_to_csv_vars.json b/process/io/mfile_to_csv_vars.json index dc589edaef..1e089ba71c 100644 --- a/process/io/mfile_to_csv_vars.json +++ b/process/io/mfile_to_csv_vars.json @@ -8,7 +8,7 @@ "alstroh", "sig_tf_wp_max", "thwcndut", - "fcohbop", + "f_j_cs_start_pulse_end_flat_top", "alstroh", "rmajor", "dr_tf_inboard", diff --git a/process/pfcoil.py b/process/pfcoil.py index 8e24dbe4ea..1f6e676135 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -116,7 +116,9 @@ def pfcoil(self): pfv.n_pf_cs_plasma_circuits = pfv.n_cs_pf_coils + 1 # Overall current density in the Central Solenoid at beginning of pulse - pfv.j_cs_pulse_start = pfv.j_cs_flat_top_end * pfv.fcohbop + pfv.j_cs_pulse_start = ( + pfv.j_cs_flat_top_end * pfv.f_j_cs_start_pulse_end_flat_top + ) # Set up array of times tv.tim[0] = 0.0e0 @@ -163,7 +165,7 @@ def pfcoil(self): bv.hmax * pfv.f_z_cs_tf_internal / pfv.nfxfh * ((nng + 1) - 0.5e0) ) pf.zfxf[nng + pfv.nfxfh] = -pf.zfxf[nng] - pf.cfxf[nng] = -ioheof / pf.nfxf * pfv.fcohbop + pf.cfxf[nng] = -ioheof / pf.nfxf * pfv.f_j_cs_start_pulse_end_flat_top pf.cfxf[nng + pfv.nfxfh] = pf.cfxf[nng] # Scale PF coil locations @@ -483,9 +485,15 @@ def pfcoil(self): ) dics = csflux / ddics - pfv.f_j_cs_start_end_flat_top = ((-ioheof * pfv.fcohbop) + dics) / ioheof - pfv.f_j_cs_start_end_flat_top = min(pfv.f_j_cs_start_end_flat_top, 1.0e0) # constrains abs(f_j_cs_start_end_flat_top) <= 1.0; - pfv.f_j_cs_start_end_flat_top = max(pfv.f_j_cs_start_end_flat_top, -1.0e0) # probably un-necessary + pfv.f_j_cs_start_end_flat_top = ( + (-ioheof * pfv.f_j_cs_start_pulse_end_flat_top) + dics + ) / ioheof + pfv.f_j_cs_start_end_flat_top = min( + pfv.f_j_cs_start_end_flat_top, 1.0e0 + ) # constrains abs(f_j_cs_start_end_flat_top) <= 1.0; + pfv.f_j_cs_start_end_flat_top = max( + pfv.f_j_cs_start_end_flat_top, -1.0e0 + ) # probably un-necessary else: dics = 0.0e0 @@ -516,20 +524,30 @@ def pfcoil(self): # Beginning of flat-top: t = tv.t_precharge+tv.t_current_ramp_up pfv.c_pf_cs_coil_flat_top_ma[ncl] = 1.0e-6 * ( - pf.ccls[nng] - (pf.ccl0[nng] * pfv.f_j_cs_start_end_flat_top / pfv.fcohbop) + pf.ccls[nng] + - ( + pf.ccl0[nng] + * pfv.f_j_cs_start_end_flat_top + / pfv.f_j_cs_start_pulse_end_flat_top + ) ) # End of flat-top: t = tv.t_precharge+tv.t_current_ramp_up+tv.t_fusion_ramp+tv.t_burn pfv.c_pf_cs_coil_pulse_end_ma[ncl] = 1.0e-6 * ( - pf.ccls[nng] - (pf.ccl0[nng] * (1.0e0 / pfv.fcohbop)) + pf.ccls[nng] + - (pf.ccl0[nng] * (1.0e0 / pfv.f_j_cs_start_pulse_end_flat_top)) ) ncl = ncl + 1 # Current in Central Solenoid as a function of time # N.B. If the Central Solenoid is not present then ioheof is zero. - pfv.c_pf_cs_coil_pulse_start_ma[ncl] = -1.0e-6 * ioheof * pfv.fcohbop - pfv.c_pf_cs_coil_flat_top_ma[ncl] = 1.0e-6 * ioheof * pfv.f_j_cs_start_end_flat_top + pfv.c_pf_cs_coil_pulse_start_ma[ncl] = ( + -1.0e-6 * ioheof * pfv.f_j_cs_start_pulse_end_flat_top + ) + pfv.c_pf_cs_coil_flat_top_ma[ncl] = ( + 1.0e-6 * ioheof * pfv.f_j_cs_start_end_flat_top + ) pfv.c_pf_cs_coil_pulse_end_ma[ncl] = 1.0e-6 * ioheof # Set up coil current waveforms, normalised to the peak current in @@ -819,7 +837,7 @@ def pfcoil(self): pfv.n_pf_coil_turns[pfv.n_cs_pf_coils] = 1.0e0 # Generate coil currents as a function of time using - # user-provided waveforms etc. (c_pf_coil_turn_peak_input, fcohbop, f_j_cs_start_end_flat_top) + # user-provided waveforms etc. (c_pf_coil_turn_peak_input, f_j_cs_start_pulse_end_flat_top, f_j_cs_start_end_flat_top) for k in range(6): # time points for i in range(pfv.n_pf_cs_plasma_circuits - 1): pfv.c_pf_coil_turn[i, k] = pfv.waves[i, k] * math.copysign( @@ -945,9 +963,7 @@ def efc( ) # Solve matrix equation - ccls = self.solv( - pfv.n_pf_groups_max, n_pf_coil_groups, nrws, gmat, bvec - ) + ccls = self.solv(pfv.n_pf_groups_max, n_pf_coil_groups, nrws, gmat, bvec) # Calculate the norm of the residual vectors brssq, brnrm, bzssq, bznrm, ssq = rsid( @@ -1029,7 +1045,7 @@ def solv(self, n_pf_groups_max, n_pf_coil_groups, nrws, gmat, bvec): numpy.ndarray, numpy.ndarray] """ ccls = np.zeros(n_pf_groups_max) - work2 = np.zeros(ngrpmx) + work2 = np.zeros(n_pf_groups_max) umat, sigma, vmat = svd(gmat) @@ -1264,12 +1280,12 @@ def ohcalc(self): # Allowable coil overall current density at EOF # (superconducting coils only) - + ( jcritwp, pfv.jcableoh_eof, pfv.j_cs_conductor_critical_flat_top_end, tmarg1, - = self.superconpf( + ) = self.superconpf( pfv.b_cs_peak_flat_top_end, pfv.f_a_cs_void, pfv.fcuohsu, @@ -1295,12 +1311,12 @@ def ohcalc(self): # Allowable coil overall current density at BOP - + ( jcritwp, pfv.jcableoh_bop, pfv.j_cs_conductor_critical_pulse_start, tmarg2, - = self.superconpf( + ) = self.superconpf( pfv.b_cs_peak_pulse_start, pfv.f_a_cs_void, pfv.fcuohsu, @@ -2775,9 +2791,9 @@ def outvolt(self): ( f"{k}\t\t\t{pfv.c_pf_coil_turn[k, 0] * pfv.n_pf_coil_turns[k]:.3e}\t" f"{pfv.c_pf_coil_turn[k, 1] * pfv.n_pf_coil_turns[k]:.3e}\t" - f"{-pfv.c_pf_coil_turn[k, 1] * pfv.n_pf_coil_turns[k] * (pfv.f_j_cs_start_end_flat_top / pfv.fcohbop):.3e}\t" - f"{-pfv.c_pf_coil_turn[k, 1] * pfv.n_pf_coil_turns[k] * (pfv.f_j_cs_start_end_flat_top / pfv.fcohbop):.3e}\t" - f"{-pfv.c_pf_coil_turn[k, 1] * pfv.n_pf_coil_turns[k] * (1.0e0 / pfv.fcohbop):.3e}\t" + f"{-pfv.c_pf_coil_turn[k, 1] * pfv.n_pf_coil_turns[k] * (pfv.f_j_cs_start_end_flat_top / pfv.f_j_cs_start_pulse_end_flat_top):.3e}\t" + f"{-pfv.c_pf_coil_turn[k, 1] * pfv.n_pf_coil_turns[k] * (pfv.f_j_cs_start_end_flat_top / pfv.f_j_cs_start_pulse_end_flat_top):.3e}\t" + f"{-pfv.c_pf_coil_turn[k, 1] * pfv.n_pf_coil_turns[k] * (1.0e0 / pfv.f_j_cs_start_pulse_end_flat_top):.3e}\t" f"{pfv.c_pf_coil_turn[k, 5] * pfv.n_pf_coil_turns[k]:.3e}" ), ) @@ -2789,9 +2805,9 @@ def outvolt(self): self.outfile, ( f"{k}\t\t\t{0.0:.3e}\t{0.0:.3e}\t" - f"{(pfv.c_pf_coil_turn[k, 2] + pfv.c_pf_coil_turn[k, 1] * pfv.f_j_cs_start_end_flat_top / pfv.fcohbop) * pfv.n_pf_coil_turns[k]:.3e}\t" - f"{(pfv.c_pf_coil_turn[k, 3] + pfv.c_pf_coil_turn[k, 1] * pfv.f_j_cs_start_end_flat_top / pfv.fcohbop) * pfv.n_pf_coil_turns[k]:.3e}\t" - f"{(pfv.c_pf_coil_turn[k, 4] + pfv.c_pf_coil_turn[k, 1] * 1.0e0 / pfv.fcohbop) * pfv.n_pf_coil_turns[k]:.3e}\t" + f"{(pfv.c_pf_coil_turn[k, 2] + pfv.c_pf_coil_turn[k, 1] * pfv.f_j_cs_start_end_flat_top / pfv.f_j_cs_start_pulse_end_flat_top) * pfv.n_pf_coil_turns[k]:.3e}\t" + f"{(pfv.c_pf_coil_turn[k, 3] + pfv.c_pf_coil_turn[k, 1] * pfv.f_j_cs_start_end_flat_top / pfv.f_j_cs_start_pulse_end_flat_top) * pfv.n_pf_coil_turns[k]:.3e}\t" + f"{(pfv.c_pf_coil_turn[k, 4] + pfv.c_pf_coil_turn[k, 1] * 1.0e0 / pfv.f_j_cs_start_pulse_end_flat_top) * pfv.n_pf_coil_turns[k]:.3e}\t" "0.0e0" ), ) @@ -2800,8 +2816,8 @@ def outvolt(self): op.ovarre( self.outfile, "Ratio of central solenoid current at beginning of Pulse / end of flat-top", - "(fcohbop)", - pfv.fcohbop, + "(f_j_cs_start_pulse_end_flat_top)", + pfv.f_j_cs_start_pulse_end_flat_top, ) op.ovarre( self.outfile, diff --git a/scripts/create_dicts_config.py b/scripts/create_dicts_config.py index 50f6c7ab51..7bf42251ba 100644 --- a/scripts/create_dicts_config.py +++ b/scripts/create_dicts_config.py @@ -1,2 +1,2 @@ # parameters that start with f, but are not f-values -NON_F_VALUES = ["fcohbop", "fvsbrnni", "feffcd", "fcutfsu"] +NON_F_VALUES = ["f_j_cs_start_pulse_end_flat_top", "fvsbrnni", "feffcd", "fcutfsu"] diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index bc35a76502..c28109774f 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -297,7 +297,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) epsvmc, ftol, ipnvars, ioptimz, nineqns, ipeqns, boundu, icc, ipnfoms, name_xc use pfcoil_variables, only: rhopfbus, j_pf_coil_wp_peak, zref, fcuohsu, f_a_cs_steel, f_a_pf_coil_void, & j_cs_flat_top_end, sigpfcalw, alstroh, i_pf_conductor, fcupfsu, fvssu, etapsu, i_cs_stress, & - fb_cs_limit_max, ngc, rpf2, fcohbop, f_z_cs_tf_internal, f_a_cs_void, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & + fb_cs_limit_max, ngc, rpf2, f_j_cs_start_pulse_end_flat_top, f_z_cs_tf_internal, f_a_cs_void, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & n_pf_coil_groups, i_pf_superconductor, nfxfh, alfapf, routr, sigpfcf, rho_pf_coil, b_cs_limit_max, & n_pf_coils_in_group, nfixmx, c_pf_coil_turn_peak_input, i_pf_location, i_sup_pf_shape, rref, i_pf_current, & ccl0_ma, ccls_ma, ld_ratio_cst @@ -1840,8 +1840,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('etapsu') call parse_real_variable('etapsu', etapsu, 0.0D0, 1.0D0, & 'Efficiency of ohmic heating') - case ('fcohbop') - call parse_real_variable('fcohbop', fcohbop, 0.0D0, 1.0D0, & + case ('f_j_cs_start_pulse_end_flat_top') + call parse_real_variable('f_j_cs_start_pulse_end_flat_top', f_j_cs_start_pulse_end_flat_top, 0.0D0, 1.0D0, & 'Central Solenoid J ratio : BOP/EOF') case ('fcuohsu') call parse_real_variable('fcuohsu', fcuohsu, 0.0D0, 1.0D0, & diff --git a/source/fortran/iteration_variables.f90 b/source/fortran/iteration_variables.f90 index fca6e854fd..d40199fba1 100755 --- a/source/fortran/iteration_variables.f90 +++ b/source/fortran/iteration_variables.f90 @@ -957,25 +957,25 @@ end subroutine set_itv_40 !--------------------------------- subroutine init_itv_41 - !!
                      • (41) fcohbop + !!
                      • (41) f_j_cs_start_pulse_end_flat_top use numerics, only: lablxc, boundl, boundu implicit none - lablxc(41) = 'fcohbop ' + lablxc(41) = 'f_j_cs_start_pulse_end_flat_top ' boundl(41) = 0.001D0 boundu(41) = 1.000D0 end subroutine init_itv_41 real(kind(1.d0)) function itv_41() - use pfcoil_variables, only: fcohbop + use pfcoil_variables, only: f_j_cs_start_pulse_end_flat_top implicit none - itv_41 = fcohbop + itv_41 = f_j_cs_start_pulse_end_flat_top end function itv_41 subroutine set_itv_41(ratio) - use pfcoil_variables, only: fcohbop + use pfcoil_variables, only: f_j_cs_start_pulse_end_flat_top implicit none real(kind(1.d0)) :: ratio - fcohbop = ratio + f_j_cs_start_pulse_end_flat_top = ratio end subroutine set_itv_41 !--------------------------------- diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index 416d1708c9..eea06bde3e 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -244,7 +244,7 @@ module numerics !!
                      • (38) fjohc (f-value for equation 26) !!
                      • (39) fjohc0 (f-value for equation 27) !!
                      • (40) fgamcd (f-value for equation 37) - !!
                      • (41) fcohbop + !!
                      • (41) f_j_cs_start_pulse_end_flat_top !!
                      • (42) dr_cs_tf_gap !!
                      • (43) NOT USED !!
                      • (44) fvsbrnni diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index fc8a0dfce1..6deb7a9d8d 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -101,7 +101,7 @@ module pfcoil_variables real(dp) :: f_j_cs_start_end_flat_top !! ratio of central solenoid overall current density at beginning of flat-top / end of flat-top - real(dp) :: fcohbop + real(dp) :: f_j_cs_start_pulse_end_flat_top !! ratio of central solenoid overall current density at beginning of pulse / end of flat-top !! (`iteration variable 41`) @@ -439,7 +439,7 @@ subroutine init_pfcoil_variables c_pf_cs_coil_pulse_end_ma = 0.0D0 etapsu = 0.9D0 f_j_cs_start_end_flat_top = 0.0D0 - fcohbop = 0.9D0 + f_j_cs_start_pulse_end_flat_top = 0.9D0 fcuohsu = 0.7D0 fcupfsu = 0.69D0 fvssu = 1.0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 70ebea1359..69aa4555d7 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -61,9 +61,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.4190E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 9.0316E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.4144E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.4380E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0487E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.4374E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.4380E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0487E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.4374E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.1737E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.1036E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.1709E-01 @@ -869,7 +869,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -1300,10 +1300,10 @@ fjohc = 0.6 *--------------------------------------------------* icc = 27 ixc = 39 * fjohc0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top boundu(39) = 1.0 fjohc0 = 0.6 -fcohbop = 0.9 +f_j_cs_start_pulse_end_flat_top = 0.9 * I_op/I_Crit TF coil limit * *---------------------------* diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 1483023c72..c5d9624dc5 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -62,9 +62,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.4190E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 9.0316E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.4144E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.4380E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0487E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.4374E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.4380E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0487E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.4374E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.1737E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.1036E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.1709E-01 @@ -870,7 +870,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -1301,10 +1301,10 @@ fjohc = 0.6 *--------------------------------------------------* icc = 27 ixc = 39 * fjohc0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top boundu(39) = 1.0 fjohc0 = 0.6 -fcohbop = 0.9 +f_j_cs_start_pulse_end_flat_top = 0.9 * I_op/I_Crit TF coil limit * *---------------------------* diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index ac647254c4..ab5512a4e0 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -62,9 +62,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.4190E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 9.0316E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.4144E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.4380E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0487E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.4374E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.4380E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0487E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.4374E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.1737E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.1036E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 6.1709E-01 @@ -870,7 +870,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -1301,10 +1301,10 @@ fjohc = 0.6 *--------------------------------------------------* icc = 27 ixc = 39 * fjohc0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top boundu(39) = 1.0 fjohc0 = 0.6 -fcohbop = 0.9 +f_j_cs_start_pulse_end_flat_top = 0.9 * I_op/I_Crit TF coil limit * *---------------------------* diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 178e83c3ee..ee13b45f9d 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -62,9 +62,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.4190E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 9.0316E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.4144E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.4380E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0487E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.8374E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.4380E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0487E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.8374E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.1737E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.1036E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.1709E-01 @@ -870,7 +870,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.8000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4380E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.4380E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.4083E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -1301,10 +1301,10 @@ fjohc = 0.6 *--------------------------------------------------* icc = 27 ixc = 39 * fjohc0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top boundu(39) = 1.0 fjohc0 = 0.6 -fcohbop = 0.9 +f_j_cs_start_pulse_end_flat_top = 0.9 * I_op/I_Crit TF coil limit * *---------------------------* diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index a37099c04f..be8c6b964f 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -113,10 +113,10 @@ fjohc = 0.6 *--------------------------------------------------* icc = 27 ixc = 39 * fjohc0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top boundu(39) = 1.0 fjohc0 = 0.6 -fcohbop = 0.9 +f_j_cs_start_pulse_end_flat_top = 0.9 * I_op/I_Crit TF coil limit * *---------------------------* diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 18d99279fc..d8c0c6aef6 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -61,9 +61,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.4340E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 9.0567E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.4294E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.4577E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0509E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.4572E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.4577E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0509E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.4572E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.1458E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0993E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.1429E-01 @@ -873,7 +873,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.7000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4577E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.4577E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.3540E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -1304,10 +1304,10 @@ fjohc = 0.6 *--------------------------------------------------* icc = 27 ixc = 39 * fjohc0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top boundu(39) = 1.0 fjohc0 = 0.6 -fcohbop = 0.9 +f_j_cs_start_pulse_end_flat_top = 0.9 * I_op/I_Crit TF coil limit * *---------------------------* diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 2ace33ea33..540d2aa62a 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -57,7 +57,7 @@ boundl(18) = 3.0 ixc = 29 * dr_bore boundl(29) = 0.1 ixc = 37 * j_cs_flat_top_end -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top ixc = 44 * fvsbrnni ixc = 56 * tdmptf ixc = 57 * thkcas @@ -281,7 +281,7 @@ epsvmc = 1e-7 * epsvmc /1;0e-6/ ; error tolerance for VMCON alstroh = 7.5d8 * allowable hoop stress in Central Solenoid structural material (Pa) j_cs_flat_top_end = 21443595.371072624 * Central solenoid overall current density at end of flat-top (A/m2) (`iteration variable 37`) (`sweep variable 62`) c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * peak current per turn input for PF coil i (A) -fcohbop = 0.93491189654662 * ratio of central solenoid overall current density at beginning of pulse / end of flat-top +f_j_cs_start_pulse_end_flat_top = 0.93491189654662 * ratio of central solenoid overall current density at beginning of pulse / end of flat-top fcuohsu = 0.70 * copper fraction of strand in central solenoid i_pf_location = 2,2,3,3 * Switch for location of PF coil group i; i_cs_superconductor = 1 * switch for superconductor material in central solenoid; diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index f5c6d4a771..a89c66b28f 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -52,7 +52,7 @@ ixc = 38 * fjohc boundu(38) = 1.0 ixc = 39 * fjohc0 boundu(39) = 1.0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top ixc = 42 * dr_cs_tf_gap boundl(42) = 0.05 boundu(42) = 0.1 @@ -225,7 +225,7 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon j_cs_flat_top_end = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) c_pf_coil_turn_peak_input = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) -fcohbop = 0.9362 * Ratio of central solenoid overall current density at +f_j_cs_start_pulse_end_flat_top = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j @@ -349,7 +349,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) j_cs_flat_top_end = 2.0726E+07 fjohc = 5.7941E-01 fjohc0 = 5.3923E-01 - fcohbop = 9.3176E-01 + f_j_cs_start_pulse_end_flat_top = 9.3176E-01 dr_cs_tf_gap = 5.0000E-02 fvsbrnni = 3.9566E-01 fstrcase = 1.0000E+00 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index a8a6ecda23..74c4f99f64 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -69,9 +69,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.3792E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 8.9653E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.3746E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.3618E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0402E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3612E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.3618E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0402E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3612E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.2414E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.1141E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.2387E-01 @@ -871,7 +871,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.0000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3618E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.3618E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.8251E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -1232,9 +1232,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.3833E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 1.0008E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.3787E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.3607E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 9.9988E-01 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3601E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.3607E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 9.9988E-01 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3601E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.2925E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0071E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.2898E-01 @@ -2034,7 +2034,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3607E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.3607E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.9479E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -2395,9 +2395,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.3818E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 9.9972E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.3772E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.3661E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0006E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3654E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.3661E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0006E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3654E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.3450E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0072E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.3424E-01 @@ -3197,7 +3197,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3661E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.3661E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -2.0517E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -3558,9 +3558,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.3828E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 1.0002E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.3781E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.3720E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0006E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3714E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.3720E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0006E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3714E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.3452E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.3425E-01 @@ -4360,7 +4360,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3720E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.3720E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -2.0952E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -4721,9 +4721,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.3598E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 9.9573E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.3552E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.3460E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 9.9722E-01 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3453E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.3460E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 9.9722E-01 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3453E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.2904E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 9.9255E-01 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.2877E-01 @@ -5523,7 +5523,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3460E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.3460E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.9731E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -5884,9 +5884,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.3255E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 9.9360E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.3208E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.3261E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 9.9787E-01 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3254E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.3261E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 9.9787E-01 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3254E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.2344E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 9.9232E-01 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.2316E-01 @@ -6686,7 +6686,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.0000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3261E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.3261E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.8444E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -7047,9 +7047,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.3207E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 9.9910E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.3161E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.3271E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0001E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3264E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.3271E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0001E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3264E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.2345E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.2318E-01 @@ -7849,7 +7849,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.0000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3271E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.3271E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.8841E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -8210,9 +8210,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.3216E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 1.0002E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.3170E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.3278E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0001E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3271E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.3278E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0001E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3271E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.2870E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0073E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.2843E-01 @@ -9012,7 +9012,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3278E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.3278E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -2.0105E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -9373,9 +9373,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.3112E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 9.9805E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.3066E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.3240E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 9.9959E-01 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3233E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.3240E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 9.9959E-01 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3233E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.3351E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0066E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.3324E-01 @@ -10175,7 +10175,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3240E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.3240E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -2.1463E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -10536,9 +10536,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.3087E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 9.9951E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.3040E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.3251E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0001E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3244E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.3251E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0001E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3244E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.3353E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.3327E-01 @@ -11338,7 +11338,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3251E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.3251E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -2.1684E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -11699,9 +11699,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.3425E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 1.0064E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.3378E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.3398E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0016E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3392E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.3398E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0016E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3392E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.2788E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 9.9229E-01 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.2760E-01 @@ -12501,7 +12501,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3398E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.3398E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -2.0290E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -12862,9 +12862,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.3867E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 1.0083E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.3821E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.3669E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0029E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3662E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.3669E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0029E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3662E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.2215E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 9.9214E-01 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.2188E-01 @@ -13664,7 +13664,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.0000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3669E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.3669E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.9196E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -14025,9 +14025,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.3871E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 1.0001E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.3825E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.3704E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0004E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3697E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.3704E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0004E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3697E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.2217E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.2189E-01 @@ -14827,7 +14827,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.0000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3704E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.3704E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.9463E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -15188,9 +15188,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.3761E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 9.9794E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.3714E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.3585E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 9.9874E-01 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3579E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.3585E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 9.9874E-01 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3579E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.2710E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0068E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.2682E-01 @@ -15990,7 +15990,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3585E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.3585E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -2.0470E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -16351,9 +16351,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.3692E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 9.9872E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.3645E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.3499E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 9.9908E-01 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3493E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.3499E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 9.9908E-01 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.3493E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.3193E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0066E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.3166E-01 @@ -17153,7 +17153,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.1000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.3499E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.3499E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -2.1467E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -17596,10 +17596,10 @@ fjohc = 0.6 *--------------------------------------------------* icc = 27 ixc = 39 * fjohc0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top boundu(39) = 1.0 fjohc0 = 0.6 -fcohbop = 0.9 +f_j_cs_start_pulse_end_flat_top = 0.9 * I_op/I_Crit TF coil limit * *---------------------------* diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 254a3e258e..ebd14858dc 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -68,9 +68,9 @@ fjohc0__________________________________________________________________ (itvar015)____________________ 1.3899E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm015)______________________ 2.5776E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar015)___________________ 1.3813E-01 - fcohbop_________________________________________________________________ (itvar016)____________________ 1.0000E+00 - fcohbop_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0732E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar016)____________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0732E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 gapoh___________________________________________________________________ (itvar017)____________________ 5.0000E-02 gapoh_(final_value/initial_value)_______________________________________ (xcm017)______________________ 1.0000E+00 gapoh_(range_normalised)________________________________________________ (nitvar017)___________________ 0.0000E+00 @@ -706,7 +706,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -1063,9 +1063,9 @@ fjohc0__________________________________________________________________ (itvar015)____________________ 1.3899E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar015)___________________ 1.3813E-01 - fcohbop_________________________________________________________________ (itvar016)____________________ 1.0000E+00 - fcohbop_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar016)____________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 gapoh___________________________________________________________________ (itvar017)____________________ 5.0000E-02 gapoh_(final_value/initial_value)_______________________________________ (xcm017)______________________ 1.0000E+00 gapoh_(range_normalised)________________________________________________ (nitvar017)___________________ 0.0000E+00 @@ -1701,7 +1701,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -2058,9 +2058,9 @@ fjohc0__________________________________________________________________ (itvar015)____________________ 1.3899E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar015)___________________ 1.3813E-01 - fcohbop_________________________________________________________________ (itvar016)____________________ 1.0000E+00 - fcohbop_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar016)____________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 gapoh___________________________________________________________________ (itvar017)____________________ 5.0000E-02 gapoh_(final_value/initial_value)_______________________________________ (xcm017)______________________ 1.0000E+00 gapoh_(range_normalised)________________________________________________ (nitvar017)___________________ 0.0000E+00 @@ -2696,7 +2696,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -3053,9 +3053,9 @@ fjohc0__________________________________________________________________ (itvar015)____________________ 1.3899E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar015)___________________ 1.3813E-01 - fcohbop_________________________________________________________________ (itvar016)____________________ 1.0000E+00 - fcohbop_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar016)____________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 gapoh___________________________________________________________________ (itvar017)____________________ 5.0000E-02 gapoh_(final_value/initial_value)_______________________________________ (xcm017)______________________ 1.0000E+00 gapoh_(range_normalised)________________________________________________ (nitvar017)___________________ 0.0000E+00 @@ -3691,7 +3691,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -4048,9 +4048,9 @@ fjohc0__________________________________________________________________ (itvar015)____________________ 1.3899E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar015)___________________ 1.3813E-01 - fcohbop_________________________________________________________________ (itvar016)____________________ 1.0000E+00 - fcohbop_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar016)____________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 gapoh___________________________________________________________________ (itvar017)____________________ 5.0000E-02 gapoh_(final_value/initial_value)_______________________________________ (xcm017)______________________ 1.0000E+00 gapoh_(range_normalised)________________________________________________ (nitvar017)___________________ 0.0000E+00 @@ -4686,7 +4686,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -5043,9 +5043,9 @@ fjohc0__________________________________________________________________ (itvar015)____________________ 1.3899E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar015)___________________ 1.3813E-01 - fcohbop_________________________________________________________________ (itvar016)____________________ 1.0000E+00 - fcohbop_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar016)____________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 gapoh___________________________________________________________________ (itvar017)____________________ 5.0000E-02 gapoh_(final_value/initial_value)_______________________________________ (xcm017)______________________ 1.0000E+00 gapoh_(range_normalised)________________________________________________ (nitvar017)___________________ 0.0000E+00 @@ -5681,7 +5681,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -6038,9 +6038,9 @@ fjohc0__________________________________________________________________ (itvar015)____________________ 1.3899E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar015)___________________ 1.3813E-01 - fcohbop_________________________________________________________________ (itvar016)____________________ 1.0000E+00 - fcohbop_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar016)____________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 gapoh___________________________________________________________________ (itvar017)____________________ 5.0000E-02 gapoh_(final_value/initial_value)_______________________________________ (xcm017)______________________ 1.0000E+00 gapoh_(range_normalised)________________________________________________ (nitvar017)___________________ 0.0000E+00 @@ -6676,7 +6676,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -7033,9 +7033,9 @@ fjohc0__________________________________________________________________ (itvar015)____________________ 1.3899E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar015)___________________ 1.3813E-01 - fcohbop_________________________________________________________________ (itvar016)____________________ 1.0000E+00 - fcohbop_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar016)____________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 gapoh___________________________________________________________________ (itvar017)____________________ 5.0000E-02 gapoh_(final_value/initial_value)_______________________________________ (xcm017)______________________ 1.0000E+00 gapoh_(range_normalised)________________________________________________ (nitvar017)___________________ 0.0000E+00 @@ -7671,7 +7671,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -8028,9 +8028,9 @@ fjohc0__________________________________________________________________ (itvar015)____________________ 1.3899E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0000E+00 fjohc0_(range_normalised)_______________________________________________ (nitvar015)___________________ 1.3813E-01 - fcohbop_________________________________________________________________ (itvar016)____________________ 1.0000E+00 - fcohbop_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar016)____________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm016)______________________ 1.0000E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar016)___________________ 1.0000E+00 gapoh___________________________________________________________________ (itvar017)____________________ 5.0000E-02 gapoh_(final_value/initial_value)_______________________________________ (xcm017)______________________ 1.0000E+00 gapoh_(range_normalised)________________________________________________ (nitvar017)___________________ 0.0000E+00 @@ -8666,7 +8666,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -6.2115E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 1.0000E+00 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 1.0000E+00 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ 4.6908E-02 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -9029,7 +9029,7 @@ ixc = 38 * fjohc boundu(38) = 1.0 ixc = 39 * fjohc0 boundu(39) = 1.0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top ixc = 42 * dr_cs_tf_gap boundl(42) = 0.05 boundu(42) = 0.1 @@ -9204,7 +9204,7 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon j_cs_flat_top_end = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) c_pf_coil_turn_peak_input = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) -fcohbop = 0.9362 * Ratio of central solenoid overall current density at +f_j_cs_start_pulse_end_flat_top = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j @@ -9329,7 +9329,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) j_cs_flat_top_end = 2.0726E+07 fjohc = 5.7941E-01 fjohc0 = 5.3923E-01 - fcohbop = 9.3176E-01 + f_j_cs_start_pulse_end_flat_top = 9.3176E-01 dr_cs_tf_gap = 5.0000E-02 fvsbrnni = 3.9566E-01 fstrcase = 1.0000E+00 diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 8b9d3a8544..b5b3cf78d5 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -52,7 +52,7 @@ ixc = 38 * fjohc boundu(38) = 1.0 ixc = 39 * fjohc0 boundu(39) = 1.0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top ixc = 42 * dr_cs_tf_gap boundl(42) = 0.05 boundu(42) = 0.1 @@ -225,7 +225,7 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon j_cs_flat_top_end = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) c_pf_coil_turn_peak_input = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) -fcohbop = 0.9362 * Ratio of central solenoid overall current density at +f_j_cs_start_pulse_end_flat_top = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j @@ -349,7 +349,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) j_cs_flat_top_end = 2.0726E+07 fjohc = 5.7941E-01 fjohc0 = 5.3923E-01 - fcohbop = 9.3176E-01 + f_j_cs_start_pulse_end_flat_top = 9.3176E-01 dr_cs_tf_gap = 5.0000E-02 fvsbrnni = 3.9566E-01 fstrcase = 1.0000E+00 diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index cebf61f092..59dd7fff86 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -52,7 +52,7 @@ ixc = 38 * fjohc boundu(38) = 1.0 ixc = 39 * fjohc0 boundu(39) = 1.0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top ixc = 42 * dr_cs_tf_gap boundl(42) = 0.05 boundu(42) = 0.1 @@ -225,7 +225,7 @@ epsvmc = 1.0e-8 * Error tolerance for vmcon j_cs_flat_top_end = 13540000.0 * Central solenoid overall current density at end of flat-top (a/m2) c_pf_coil_turn_peak_input = 4.22d4, 4.22d4, 4.22d4, 4.22d4, 4.3d4, 4.3d4, 4.3d4, 4.3d4, * Peak current per turn input for pf coil i (a) -fcohbop = 0.9362 * Ratio of central solenoid overall current density at +f_j_cs_start_pulse_end_flat_top = 0.9362 * Ratio of central solenoid overall current density at i_pf_location = 2,2,3,3 * Switch for locating scheme of pf coil group i; i_pf_superconductor = 3 * Switch for superconductor material in pf coils; n_pf_coils_in_group = 1,1,2,2, * Number of pf coils in group j @@ -349,7 +349,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1) j_cs_flat_top_end = 2.0726E+07 fjohc = 5.7941E-01 fjohc0 = 5.3923E-01 - fcohbop = 9.3176E-01 + f_j_cs_start_pulse_end_flat_top = 9.3176E-01 dr_cs_tf_gap = 5.0000E-02 fvsbrnni = 3.9566E-01 fstrcase = 1.0000E+00 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index a0ed681124..4987d3c612 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1894,7 +1894,7 @@ "fcdfuel": 0.1, "fce1_": "wce1_/(2*pi)", "f_j_cs_start_end_flat_top": 0.0, - "fcohbop": 0.9, + "f_j_cs_start_pulse_end_flat_top": 0.9, "fcontng": 0.195, "fcoolcp": 0.3, "f_a_tf_cool_outboard": 0.2, @@ -9510,7 +9510,7 @@ "fcdfuel": "fraction of current drive cost treated as fuel (if `ifueltyp = 1`)", "fce1_": "", "f_j_cs_start_end_flat_top": "ratio of central solenoid overall current density at beginning of flat-top / end of flat-top", - "fcohbop": "ratio of central solenoid overall current density at beginning of pulse / end of flat-top\n (`iteration variable 41`)", + "f_j_cs_start_pulse_end_flat_top": "ratio of central solenoid overall current density at beginning of pulse / end of flat-top\n (`iteration variable 41`)", "fcontng": "project contingency factor", "fcoolcp": "coolant fraction of TF coil inboard legs (`iteration variable 23`)", "f_a_tf_cool_outboard": "coolant fraction of TF coil outboard legs", @@ -9956,8 +9956,8 @@ "ksic": "power fraction for outboard double-null scrape-off plasma", "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)
                          \n
                          \n
                        • ( 1) Beta (consistency equation) (itv 5)\n
                        • ( 2) Global power balance (consistency equation) (itv 10,1,2,3,4,6,11)\n
                        • ( 3) Ion power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
                        • ( 4) Electron power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
                        • ( 5) Density upper limit (itv 9,1,2,3,4,5,6)\n
                        • ( 6) (Epsilon x beta poloidal) upper limit (itv 8,1,2,3,4,6)\n
                        • ( 7) Beam ion density (NBI) (consistency equation) (itv 7)\n
                        • ( 8) Neutron wall load upper limit (itv 14,1,2,3,4,6)\n
                        • ( 9) Fusion power upper limit (itv 26,1,2,3,4,6)\n
                        • (10) Toroidal field 1/R (consistency equation) (itv 12,1,2,3,13 )\n
                        • (11) Radial build (consistency equation) (itv 3,1,13,16,29,42,61)\n
                        • (12) Volt second lower limit (STEADY STATE) (itv 15,1,2,3)\n
                        • (13) Burn time lower limit (PULSE) (itv 21,1,16,17,29,42,44,61)\n (itv 19,1,2,3,6)\n
                        • (14) Neutral beam decay lengths to plasma centre (NBI) (consistency equation)\n
                        • (15) LH power threshold limit (itv 103)\n
                        • (16) Net electric power lower limit (itv 25,1,2,3)\n
                        • (17) Radiation fraction upper limit (itv 28)\n
                        • (18) Divertor heat load upper limit (itv 27)\n
                        • (19) MVA upper limit (itv 30)\n
                        • (20) Neutral beam tangency radius upper limit (NBI) (itv 33,31,3,13)\n
                        • (21) Plasma minor radius lower limit (itv 32)\n
                        • (22) Divertor collisionality upper limit (itv 34,43)\n
                        • (23) Conducting shell to plasma minor radius ratio upper limit\n (itv 104,1,74)\n
                        • (24) Beta upper limit (itv 36,1,2,3,4,6,18)\n
                        • (25) Peak toroidal field upper limit (itv 35,3,13,29)\n
                        • (26) Central solenoid EOF current density upper limit (i_pf_conductor=0)\n (itv 38,37,41,12)\n
                        • (27) Central solenoid BOP current density upper limit (i_pf_conductor=0)\n (itv 39,37,41,12)\n
                        • (28) Fusion gain Q lower limit (itv 45,47,40)\n
                        • (29) Inboard radial build consistency (itv 3,1,13,16,29,42,61)\n
                        • (30) Injection power upper limit (itv 46,47,11)\n
                        • (31) TF coil case stress upper limit (SCTF) (itv 48,56,57,58,59,60,24)\n
                        • (32) TF coil conduit stress upper limit (SCTF) (itv 49,56,57,58,59,60,24)\n
                        • (33) I_op / I_critical (TF coil) (SCTF) (itv 50,56,57,58,59,60,24)\n
                        • (34) Dump voltage upper limit (SCTF) (itv 51,52,56,57,58,59,60,24)\n
                        • (35) J_winding pack/J_protection upper limit (SCTF) (itv 53,56,57,58,59,60,24)\n
                        • (36) TF coil temperature margin lower limit (SCTF) (itv 54,55,56,57,58,59,60,24)\n
                        • (37) Current drive gamma upper limit (itv 40,47)\n
                        • (38) First wall coolant temperature rise upper limit (itv 62)\n
                        • (39) First wall peak temperature upper limit (itv 63)\n
                        • (40) Start-up injection power lower limit (PULSE) (itv 64)\n
                        • (41) Plasma current ramp-up time lower limit (PULSE) (itv 66,65)\n
                        • (42) Cycle time lower limit (PULSE) (itv 17,67,65)\n
                        • (43) Average centrepost temperature\n (TART) (consistency equation) (itv 13,20,69,70)\n
                        • (44) Peak centrepost temperature upper limit (TART) (itv 68,69,70)\n
                        • (45) Edge safety factor lower limit (TART) (itv 71,1,2,3)\n
                        • (46) Equation for Ip/Irod upper limit (TART) (itv 72,2,60)\n
                        • (47) NOT USED\n
                        • (48) Poloidal beta upper limit (itv 79,2,3,18)\n
                        • (49) NOT USED\n
                        • (50) IFE repetition rate upper limit (IFE)\n
                        • (51) Startup volt-seconds consistency (PULSE) (itv 16,29,3,1)\n
                        • (52) Tritium breeding ratio lower limit (itv 89,90,91)\n
                        • (53) Neutron fluence on TF coil upper limit (itv 92,93,94)\n
                        • (54) Peak TF coil nuclear heating upper limit (itv 95,93,94)\n
                        • (55) Vacuum vessel helium concentration upper limit i_blanket_type =2 (itv 96,93,94)\n
                        • (56) Pseparatrix/Rmajor upper limit (itv 97,1,3)\n
                        • (57) NOT USED\n
                        • (58) NOT USED\n
                        • (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 )\n
                        • (60) Central solenoid temperature margin lower limit (SCTF) (itv 106)\n
                        • (61) Minimum availability value (itv 107)\n
                        • (62) f_alpha_energy_confinement the ratio of particle to energy confinement times (itv 110)\n
                        • (63) The number of ITER-like vacuum pumps niterpump < tfno (itv 111)\n
                        • (64) Zeff less than or equal to zeffmax (itv 112)\n
                        • (65) Dump time set by VV loads (itv 56, 113)\n
                        • (66) Limit on rate of change of energy in poloidal field\n (Use iteration variable 65(t_current_ramp_up), 115)\n
                        • (67) Simple Radiation Wall load limit (itv 116, 4,6)\n
                        • (68) Psep * Bt / qAR upper limit (itv 117)\n
                        • (69) ensure separatrix power = the value from Kallenbach divertor (itv 118)\n
                        • (70) ensure that teomp = separatrix temperature in the pedestal profile,\n (itv 119 (tesep))\n
                        • (71) ensure that neomp = separatrix density (nesep) x neratio\n
                        • (72) central solenoid shear stress limit (Tresca yield criterion) (itv 123 foh_stress)\n
                        • (73) Psep >= Plh + Paux (itv 137 (fplhsep))\n
                        • (74) TFC quench < tmax_croco (itv 141 (fcqt))\n
                        • (75) TFC current/copper area < Maximum (itv 143 f_coppera_m2)\n
                        • (76) Eich critical separatrix density\n
                        • (77) TF coil current per turn upper limit\n
                        • (78) Reinke criterion impurity fraction lower limit (itv 147 freinke)\n
                        • (79) Peak CS field upper limit (itv 149 fb_cs_limit_max)\n
                        • (80) Divertor power lower limit pdivt (itv 153 fpdivlim)\n
                        • (81) Ne(0) > ne(ped) constraint (itv 154 fne0)\n
                        • (82) toroidalgap > tftort constraint (itv 171 ftoroidalgap)\n
                        • (83) Radial build consistency for stellarators (itv 172 f_avspace)\n
                        • (84) Lower limit for beta (itv 173 fbeta_min)\n
                        • (85) Constraint for CP lifetime\n
                        • (86) Constraint for TF coil turn dimension\n
                        • (87) Constraint for cryogenic power\n
                        • (88) Constraint for TF coil strain absolute value\n
                        • (89) Constraint for CS coil quench protection\n
                        • (90) Checking if the design point is ECRH ignitable (itv 164 fecrh_ignition)
                        \n\n\n\n", "lablmm": "lablmm(ipnfoms) : labels describing figures of merit:
                          \n
                          \n
                        • ( 1) major radius\n
                        • ( 2) not used\n
                        • ( 3) neutron wall load\n
                        • ( 4) P_tf + P_pf\n
                        • ( 5) fusion gain Q\n
                        • ( 6) cost of electricity\n
                        • ( 7) capital cost (direct cost if ireactor=0,\n constructed cost otherwise)\n
                        • ( 8) aspect ratio\n
                        • ( 9) divertor heat load\n
                        • (10) toroidal field\n
                        • (11) total injected power\n
                        • (12) hydrogen plant capital cost OBSOLETE\n
                        • (13) hydrogen production rate OBSOLETE\n
                        • (14) pulse length\n
                        • (15) plant availability factor (N.B. requires\n iavail=1 to be set)\n
                        • (16) linear combination of major radius (minimised) and pulse length (maximised)\n note: FoM should be minimised only!\n
                        • (17) net electrical output\n
                        • (18) Null Figure of Merit\n
                        • (19) linear combination of big Q and pulse length (maximised)\n note: FoM should be minimised only!
                        \n\n\n", - "lablxc": "lablxc(ipnvars) : labels describing iteration variables
                          \n
                          \n
                        • ( 1) aspect\n
                        • ( 2) bt\n
                        • ( 3) rmajor\n
                        • ( 4) te\n
                        • ( 5) beta\n
                        • ( 6) dene\n
                        • ( 7) f_nd_beam_electron\n
                        • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
                        • ( 9) fdene (f-value for equation 5)\n
                        • (10) hfact\n
                        • (11) pheat\n
                        • (12) oacdcp\n
                        • (13) dr_tf_inboard (NOT RECOMMENDED)\n
                        • (14) fwalld (f-value for equation 8)\n
                        • (15) fvs (f-value for equation 12)\n
                        • (16) dr_cs\n
                        • (17) tdwell\n
                        • (18) q\n
                        • (19) beam_energy\n
                        • (20) temp_cp_average\n
                        • (21) ftburn (f-value for equation 13)\n
                        • (22) NOT USED\n
                        • (23) fcoolcp\n
                        • (24) NOT USED\n
                        • (25) fpnetel (f-value for equation 16)\n
                        • (26) ffuspow (f-value for equation 9)\n
                        • (27) fhldiv (f-value for equation 18)\n
                        • (28) fradpwr (f-value for equation 17), total radiation fraction\n
                        • (29) dr_bore\n
                        • (30) fmva (f-value for equation 19)\n
                        • (31) gapomin\n
                        • (32) frminor (f-value for equation 21)\n
                        • (33) fportsz (f-value for equation 20)\n
                        • (34) fdivcol (f-value for equation 22)\n
                        • (35) fpeakb (f-value for equation 25)\n
                        • (36) fbeta_max (f-value for equation 24)\n
                        • (37) j_cs_flat_top_end\n
                        • (38) fjohc (f-value for equation 26)\n
                        • (39) fjohc0 (f-value for equation 27)\n
                        • (40) fgamcd (f-value for equation 37)\n
                        • (41) fcohbop\n
                        • (42) dr_cs_tf_gap\n
                        • (43) NOT USED\n
                        • (44) fvsbrnni\n
                        • (45) fqval (f-value for equation 28)\n
                        • (46) fpinj (f-value for equation 30)\n
                        • (47) feffcd\n
                        • (48) fstrcase (f-value for equation 31)\n
                        • (49) fstrcond (f-value for equation 32)\n
                        • (50) fiooic (f-value for equation 33)\n
                        • (51) fvdump (f-value for equation 34)\n
                        • (52) vdalw\n
                        • (53) fjprot (f-value for equation 35)\n
                        • (54) ftmargtf (f-value for equation 36)\n
                        • (55) NOT USED\n
                        • (56) tdmptf\n
                        • (57) thkcas\n
                        • (58) thwcndut\n
                        • (59) fcutfsu\n
                        • (60) cpttf\n
                        • (61) dr_shld_vv_gap_inboard\n
                        • (62) fdtmp (f-value for equation 38)\n
                        • (63) ftpeak (f-value for equation 39)\n
                        • (64) fauxmn (f-value for equation 40)\n
                        • (65) tohs\n
                        • (66) ftohs (f-value for equation 41)\n
                        • (67) ftcycl (f-value for equation 42)\n
                        • (68) fptemp (f-value for equation 44)\n
                        • (69) rcool\n
                        • (70) vcool\n
                        • (71) fq (f-value for equation 45)\n
                        • (72) fipir (f-value for equation 46)\n
                        • (73) dr_fw_plasma_gap_inboard\n
                        • (74) dr_fw_plasma_gap_outboard\n
                        • (75) tfootfi\n
                        • (76) NOT USED\n
                        • (77) NOT USED\n
                        • (78) NOT USED\n
                        • (79) fbeta_poloidal (f-value for equation 48)\n
                        • (80) NOT USED\n
                        • (81) edrive\n
                        • (82) drveff\n
                        • (83) tgain\n
                        • (84) chrad\n
                        • (85) pdrive\n
                        • (86) frrmax (f-value for equation 50)\n
                        • (87) NOT USED\n
                        • (88) NOT USED\n
                        • (89) ftbr (f-value for equation 52)\n
                        • (90) blbuith\n
                        • (91) blbuoth\n
                        • (92) fflutf (f-value for equation 53)\n
                        • (93) dr_shld_inboard\n
                        • (94) dr_shld_outboard\n
                        • (95) fptfnuc (f-value for equation 54)\n
                        • (96) fvvhe (f-value for equation 55)\n
                        • (97) fpsepr (f-value for equation 56)\n
                        • (98) li6enrich\n
                        • (99) NOT USED\n
                        • (100) NOT USED\n
                        • (101) NOT USED\n
                        • (102) fimpvar\n
                        • (103) fl_h_threshold (f-value for equation 15)\n
                        • (104)fr_conducting_wall (f-value for equation 23)\n
                        • (105) fnbshinef (f-value for equation 59)\n
                        • (106) ftmargoh (f-value for equation 60)\n
                        • (107) favail (f-value for equation 61)\n
                        • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
                        • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
                        • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
                        • (111) fniterpump: f-value for constraint that number\n
                        • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
                        • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
                        • (114) len_fw_channel: Length of a single first wall channel\n
                        • (115) fpoloidalpower: f-value for max rate of change of\n
                        • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
                        • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
                        • (118) fpsep: f-value to ensure separatrix power is less than\n
                        • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
                        • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
                        • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
                        • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
                        • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
                        • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
                        • (125) fimp(3) : Beryllium density fraction relative to electron density\n
                        • (126) fimp(4) : Carbon density fraction relative to electron density\n
                        • (127) fimp(5) : Nitrogen fraction relative to electron density\n
                        • (128) fimp(6) : Oxygen density fraction relative to electron density\n
                        • (129) fimp(7) : Neon density fraction relative to electron density\n
                        • (130) fimp(8) : Silicon density fraction relative to electron density\n
                        • (131) fimp(9) : Argon density fraction relative to electron density\n
                        • (132) fimp(10) : Iron density fraction relative to electron density\n
                        • (133) fimp(11) : Nickel density fraction relative to electron density\n
                        • (134) fimp(12) : Krypton density fraction relative to electron density\n
                        • (135) fimp(13) : Xenon density fraction relative to electron density\n
                        • (136) fimp(14) : Tungsten density fraction relative to electron density\n
                        • (137) fplhsep (f-value for equation 73)\n
                        • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
                        • (139) copper_thick : thickness of copper layer in tape (m)\n
                        • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
                        • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
                        • (142) nesep : electron density at separatrix [m-3]\n
                        • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
                        • (144) fnesep : Eich critical electron density at separatrix\n
                        • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
                        • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
                        • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
                        • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
                        • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
                        • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
                        • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
                        • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
                        • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
                        • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
                        • (157) fvssu : F-value for available to required start up flux (con. 51)\n
                        • (158) croco_thick : Thickness of CroCo copper tube (m)\n
                        • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
                        • (160) f_avspace (f-value for equation 83)\n
                        • (161) fbeta_min (f-value for equation 84)\n
                        • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
                        • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
                        • (164) f_crypmw : f-value for cryogenic plant power\n
                        • (165) fstr_wp : f-value for TF coil strain absolute value\n
                        • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
                        • (167) fecrh_ignition: f-value for equation 90\n
                        • (168) EMPTY : Description\n
                        • (169) EMPTY : Description\n
                        • (170) EMPTY : Description\n
                        • (171) EMPTY : Description\n
                        • (172) EMPTY : Description\n
                        • (173) EMPTY : Description\n
                        • (174) EMPTY : Description\n
                        • (175) EMPTY : Description\n\n\n\n", - "lablxc": "lablxc(ipnvars) : labels describing iteration variables
                            \n
                            \n
                          • ( 1) aspect\n
                          • ( 2) bt\n
                          • ( 3) rmajor\n
                          • ( 4) te\n
                          • ( 5) beta\n
                          • ( 6) dene\n
                          • ( 7) f_nd_beam_electron\n
                          • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
                          • ( 9) fdene (f-value for equation 5)\n
                          • (10) hfact\n
                          • (11) pheat\n
                          • (12) oacdcp\n
                          • (13) dr_tf_inboard (NOT RECOMMENDED)\n
                          • (14) fwalld (f-value for equation 8)\n
                          • (15) fvs (f-value for equation 12)\n
                          • (16) dr_cs\n
                          • (17) t_between_pulse\n
                          • (18) q\n
                          • (19) beam_energy\n
                          • (20) temp_cp_average\n
                          • (21) ft_burn (f-value for equation 13)\n
                          • (22) NOT USED\n
                          • (23) fcoolcp\n
                          • (24) NOT USED\n
                          • (25) fpnetel (f-value for equation 16)\n
                          • (26) ffuspow (f-value for equation 9)\n
                          • (27) fhldiv (f-value for equation 18)\n
                          • (28) fradpwr (f-value for equation 17), total radiation fraction\n
                          • (29) dr_bore\n
                          • (30) fmva (f-value for equation 19)\n
                          • (31) gapomin\n
                          • (32) frminor (f-value for equation 21)\n
                          • (33) fportsz (f-value for equation 20)\n
                          • (34) fdivcol (f-value for equation 22)\n
                          • (35) fpeakb (f-value for equation 25)\n
                          • (36) fbeta_max (f-value for equation 24)\n
                          • (37) j_cs_flat_top_end\n
                          • (38) fjohc (f-value for equation 26)\n
                          • (39) fjohc0 (f-value for equation 27)\n
                          • (40) fgamcd (f-value for equation 37)\n
                          • (41) fcohbop\n
                          • (42) dr_cs_tf_gap\n
                          • (43) NOT USED\n
                          • (44) fvsbrnni\n
                          • (45) fqval (f-value for equation 28)\n
                          • (46) fpinj (f-value for equation 30)\n
                          • (47) feffcd\n
                          • (48) fstrcase (f-value for equation 31)\n
                          • (49) fstrcond (f-value for equation 32)\n
                          • (50) fiooic (f-value for equation 33)\n
                          • (51) fvdump (f-value for equation 34)\n
                          • (52) vdalw\n
                          • (53) fjprot (f-value for equation 35)\n
                          • (54) ftmargtf (f-value for equation 36)\n
                          • (55) NOT USED\n
                          • (56) tdmptf\n
                          • (57) thkcas\n
                          • (58) thwcndut\n
                          • (59) fcutfsu\n
                          • (60) cpttf\n
                          • (61) dr_shld_vv_gap_inboard\n
                          • (62) fdtmp (f-value for equation 38)\n
                          • (63) ftpeak (f-value for equation 39)\n
                          • (64) fauxmn (f-value for equation 40)\n
                          • (65) t_current_ramp_up\n
                          • (66) ft_current_ramp_up (f-value for equation 41)\n
                          • (67) ftcycl (f-value for equation 42)\n
                          • (68) fptemp (f-value for equation 44)\n
                          • (69) rcool\n
                          • (70) vcool\n
                          • (71) fq (f-value for equation 45)\n
                          • (72) fipir (f-value for equation 46)\n
                          • (73) dr_fw_plasma_gap_inboard\n
                          • (74) dr_fw_plasma_gap_outboard\n
                          • (75) tfootfi\n
                          • (76) NOT USED\n
                          • (77) NOT USED\n
                          • (78) NOT USED\n
                          • (79) fbetap (f-value for equation 48)\n
                          • (80) NOT USED\n
                          • (81) edrive\n
                          • (82) drveff\n
                          • (83) tgain\n
                          • (84) chrad\n
                          • (85) pdrive\n
                          • (86) frrmax (f-value for equation 50)\n
                          • (87) NOT USED\n
                          • (88) NOT USED\n
                          • (89) ftbr (f-value for equation 52)\n
                          • (90) blbuith\n
                          • (91) blbuoth\n
                          • (92) fflutf (f-value for equation 53)\n
                          • (93) dr_shld_inboard\n
                          • (94) dr_shld_outboard\n
                          • (95) fptfnuc (f-value for equation 54)\n
                          • (96) fvvhe (f-value for equation 55)\n
                          • (97) fpsepr (f-value for equation 56)\n
                          • (98) li6enrich\n
                          • (99) NOT USED\n
                          • (100) NOT USED\n
                          • (101) NOT USED\n
                          • (102) fimpvar\n
                          • (103) fl_h_threshold (f-value for equation 15)\n
                          • (104)fr_conducting_wall (f-value for equation 23)\n
                          • (105) fnbshinef (f-value for equation 59)\n
                          • (106) ftmargoh (f-value for equation 60)\n
                          • (107) favail (f-value for equation 61)\n
                          • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
                          • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
                          • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
                          • (111) fniterpump: f-value for constraint that number\n
                          • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
                          • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
                          • (114) len_fw_channel: Length of a single first wall channel\n
                          • (115) fpoloidalpower: f-value for max rate of change of\n
                          • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
                          • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
                          • (118) fpsep: f-value to ensure separatrix power is less than\n
                          • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
                          • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
                          • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
                          • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
                          • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
                          • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
                          • (125) fimp(3) : Beryllium density fraction relative to electron density\n
                          • (126) fimp(4) : Carbon density fraction relative to electron density\n
                          • (127) fimp(5) : Nitrogen fraction relative to electron density\n
                          • (128) fimp(6) : Oxygen density fraction relative to electron density\n
                          • (129) fimp(7) : Neon density fraction relative to electron density\n
                          • (130) fimp(8) : Silicon density fraction relative to electron density\n
                          • (131) fimp(9) : Argon density fraction relative to electron density\n
                          • (132) fimp(10) : Iron density fraction relative to electron density\n
                          • (133) fimp(11) : Nickel density fraction relative to electron density\n
                          • (134) fimp(12) : Krypton density fraction relative to electron density\n
                          • (135) fimp(13) : Xenon density fraction relative to electron density\n
                          • (136) fimp(14) : Tungsten density fraction relative to electron density\n
                          • (137) fplhsep (f-value for equation 73)\n
                          • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
                          • (139) copper_thick : thickness of copper layer in tape (m)\n
                          • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
                          • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
                          • (142) nesep : electron density at separatrix [m-3]\n
                          • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
                          • (144) fnesep : Eich critical electron density at separatrix\n
                          • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
                          • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
                          • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
                          • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
                          • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
                          • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
                          • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
                          • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
                          • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
                          • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
                          • (157) fvssu : F-value for available to required start up flux (con. 51)\n
                          • (158) croco_thick : Thickness of CroCo copper tube (m)\n
                          • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
                          • (160) f_avspace (f-value for equation 83)\n
                          • (161) fbeta_min (f-value for equation 84)\n
                          • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
                          • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
                          • (164) f_crypmw : f-value for cryogenic plant power\n
                          • (165) fstr_wp : f-value for TF coil strain absolute value\n
                          • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
                          • (167) fecrh_ignition: f-value for equation 90\n
                          • (168) EMPTY : Description\n
                          • (169) EMPTY : Description\n
                          • (170) EMPTY : Description\n
                          • (171) EMPTY : Description\n
                          • (172) EMPTY : Description\n
                          • (173) EMPTY : Description\n
                          • (174) EMPTY : Description\n
                          • (175) EMPTY : Description\n\n\n\n", + "lablxc": "lablxc(ipnvars) : labels describing iteration variables
                              \n
                              \n
                            • ( 1) aspect\n
                            • ( 2) bt\n
                            • ( 3) rmajor\n
                            • ( 4) te\n
                            • ( 5) beta\n
                            • ( 6) dene\n
                            • ( 7) f_nd_beam_electron\n
                            • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
                            • ( 9) fdene (f-value for equation 5)\n
                            • (10) hfact\n
                            • (11) pheat\n
                            • (12) oacdcp\n
                            • (13) dr_tf_inboard (NOT RECOMMENDED)\n
                            • (14) fwalld (f-value for equation 8)\n
                            • (15) fvs (f-value for equation 12)\n
                            • (16) dr_cs\n
                            • (17) tdwell\n
                            • (18) q\n
                            • (19) beam_energy\n
                            • (20) temp_cp_average\n
                            • (21) ftburn (f-value for equation 13)\n
                            • (22) NOT USED\n
                            • (23) fcoolcp\n
                            • (24) NOT USED\n
                            • (25) fpnetel (f-value for equation 16)\n
                            • (26) ffuspow (f-value for equation 9)\n
                            • (27) fhldiv (f-value for equation 18)\n
                            • (28) fradpwr (f-value for equation 17), total radiation fraction\n
                            • (29) dr_bore\n
                            • (30) fmva (f-value for equation 19)\n
                            • (31) gapomin\n
                            • (32) frminor (f-value for equation 21)\n
                            • (33) fportsz (f-value for equation 20)\n
                            • (34) fdivcol (f-value for equation 22)\n
                            • (35) fpeakb (f-value for equation 25)\n
                            • (36) fbeta_max (f-value for equation 24)\n
                            • (37) j_cs_flat_top_end\n
                            • (38) fjohc (f-value for equation 26)\n
                            • (39) fjohc0 (f-value for equation 27)\n
                            • (40) fgamcd (f-value for equation 37)\n
                            • (41) f_j_cs_start_pulse_end_flat_top\n
                            • (42) dr_cs_tf_gap\n
                            • (43) NOT USED\n
                            • (44) fvsbrnni\n
                            • (45) fqval (f-value for equation 28)\n
                            • (46) fpinj (f-value for equation 30)\n
                            • (47) feffcd\n
                            • (48) fstrcase (f-value for equation 31)\n
                            • (49) fstrcond (f-value for equation 32)\n
                            • (50) fiooic (f-value for equation 33)\n
                            • (51) fvdump (f-value for equation 34)\n
                            • (52) vdalw\n
                            • (53) fjprot (f-value for equation 35)\n
                            • (54) ftmargtf (f-value for equation 36)\n
                            • (55) NOT USED\n
                            • (56) tdmptf\n
                            • (57) thkcas\n
                            • (58) thwcndut\n
                            • (59) fcutfsu\n
                            • (60) cpttf\n
                            • (61) dr_shld_vv_gap_inboard\n
                            • (62) fdtmp (f-value for equation 38)\n
                            • (63) ftpeak (f-value for equation 39)\n
                            • (64) fauxmn (f-value for equation 40)\n
                            • (65) tohs\n
                            • (66) ftohs (f-value for equation 41)\n
                            • (67) ftcycl (f-value for equation 42)\n
                            • (68) fptemp (f-value for equation 44)\n
                            • (69) rcool\n
                            • (70) vcool\n
                            • (71) fq (f-value for equation 45)\n
                            • (72) fipir (f-value for equation 46)\n
                            • (73) dr_fw_plasma_gap_inboard\n
                            • (74) dr_fw_plasma_gap_outboard\n
                            • (75) tfootfi\n
                            • (76) NOT USED\n
                            • (77) NOT USED\n
                            • (78) NOT USED\n
                            • (79) fbeta_poloidal (f-value for equation 48)\n
                            • (80) NOT USED\n
                            • (81) edrive\n
                            • (82) drveff\n
                            • (83) tgain\n
                            • (84) chrad\n
                            • (85) pdrive\n
                            • (86) frrmax (f-value for equation 50)\n
                            • (87) NOT USED\n
                            • (88) NOT USED\n
                            • (89) ftbr (f-value for equation 52)\n
                            • (90) blbuith\n
                            • (91) blbuoth\n
                            • (92) fflutf (f-value for equation 53)\n
                            • (93) dr_shld_inboard\n
                            • (94) dr_shld_outboard\n
                            • (95) fptfnuc (f-value for equation 54)\n
                            • (96) fvvhe (f-value for equation 55)\n
                            • (97) fpsepr (f-value for equation 56)\n
                            • (98) li6enrich\n
                            • (99) NOT USED\n
                            • (100) NOT USED\n
                            • (101) NOT USED\n
                            • (102) fimpvar\n
                            • (103) fl_h_threshold (f-value for equation 15)\n
                            • (104)fr_conducting_wall (f-value for equation 23)\n
                            • (105) fnbshinef (f-value for equation 59)\n
                            • (106) ftmargoh (f-value for equation 60)\n
                            • (107) favail (f-value for equation 61)\n
                            • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
                            • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
                            • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
                            • (111) fniterpump: f-value for constraint that number\n
                            • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
                            • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
                            • (114) len_fw_channel: Length of a single first wall channel\n
                            • (115) fpoloidalpower: f-value for max rate of change of\n
                            • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
                            • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
                            • (118) fpsep: f-value to ensure separatrix power is less than\n
                            • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
                            • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
                            • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
                            • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
                            • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
                            • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
                            • (125) fimp(3) : Beryllium density fraction relative to electron density\n
                            • (126) fimp(4) : Carbon density fraction relative to electron density\n
                            • (127) fimp(5) : Nitrogen fraction relative to electron density\n
                            • (128) fimp(6) : Oxygen density fraction relative to electron density\n
                            • (129) fimp(7) : Neon density fraction relative to electron density\n
                            • (130) fimp(8) : Silicon density fraction relative to electron density\n
                            • (131) fimp(9) : Argon density fraction relative to electron density\n
                            • (132) fimp(10) : Iron density fraction relative to electron density\n
                            • (133) fimp(11) : Nickel density fraction relative to electron density\n
                            • (134) fimp(12) : Krypton density fraction relative to electron density\n
                            • (135) fimp(13) : Xenon density fraction relative to electron density\n
                            • (136) fimp(14) : Tungsten density fraction relative to electron density\n
                            • (137) fplhsep (f-value for equation 73)\n
                            • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
                            • (139) copper_thick : thickness of copper layer in tape (m)\n
                            • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
                            • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
                            • (142) nesep : electron density at separatrix [m-3]\n
                            • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
                            • (144) fnesep : Eich critical electron density at separatrix\n
                            • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
                            • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
                            • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
                            • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
                            • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
                            • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
                            • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
                            • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
                            • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
                            • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
                            • (157) fvssu : F-value for available to required start up flux (con. 51)\n
                            • (158) croco_thick : Thickness of CroCo copper tube (m)\n
                            • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
                            • (160) f_avspace (f-value for equation 83)\n
                            • (161) fbeta_min (f-value for equation 84)\n
                            • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
                            • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
                            • (164) f_crypmw : f-value for cryogenic plant power\n
                            • (165) fstr_wp : f-value for TF coil strain absolute value\n
                            • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
                            • (167) fecrh_ignition: f-value for equation 90\n
                            • (168) EMPTY : Description\n
                            • (169) EMPTY : Description\n
                            • (170) EMPTY : Description\n
                            • (171) EMPTY : Description\n
                            • (172) EMPTY : Description\n
                            • (173) EMPTY : Description\n
                            • (174) EMPTY : Description\n
                            • (175) EMPTY : Description\n\n\n\n", + "lablxc": "lablxc(ipnvars) : labels describing iteration variables
                                \n
                                \n
                              • ( 1) aspect\n
                              • ( 2) bt\n
                              • ( 3) rmajor\n
                              • ( 4) te\n
                              • ( 5) beta\n
                              • ( 6) dene\n
                              • ( 7) f_nd_beam_electron\n
                              • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
                              • ( 9) fdene (f-value for equation 5)\n
                              • (10) hfact\n
                              • (11) pheat\n
                              • (12) oacdcp\n
                              • (13) dr_tf_inboard (NOT RECOMMENDED)\n
                              • (14) fwalld (f-value for equation 8)\n
                              • (15) fvs (f-value for equation 12)\n
                              • (16) dr_cs\n
                              • (17) t_between_pulse\n
                              • (18) q\n
                              • (19) beam_energy\n
                              • (20) temp_cp_average\n
                              • (21) ft_burn (f-value for equation 13)\n
                              • (22) NOT USED\n
                              • (23) fcoolcp\n
                              • (24) NOT USED\n
                              • (25) fpnetel (f-value for equation 16)\n
                              • (26) ffuspow (f-value for equation 9)\n
                              • (27) fhldiv (f-value for equation 18)\n
                              • (28) fradpwr (f-value for equation 17), total radiation fraction\n
                              • (29) dr_bore\n
                              • (30) fmva (f-value for equation 19)\n
                              • (31) gapomin\n
                              • (32) frminor (f-value for equation 21)\n
                              • (33) fportsz (f-value for equation 20)\n
                              • (34) fdivcol (f-value for equation 22)\n
                              • (35) fpeakb (f-value for equation 25)\n
                              • (36) fbeta_max (f-value for equation 24)\n
                              • (37) j_cs_flat_top_end\n
                              • (38) fjohc (f-value for equation 26)\n
                              • (39) fjohc0 (f-value for equation 27)\n
                              • (40) fgamcd (f-value for equation 37)\n
                              • (41) f_j_cs_start_pulse_end_flat_top\n
                              • (42) dr_cs_tf_gap\n
                              • (43) NOT USED\n
                              • (44) fvsbrnni\n
                              • (45) fqval (f-value for equation 28)\n
                              • (46) fpinj (f-value for equation 30)\n
                              • (47) feffcd\n
                              • (48) fstrcase (f-value for equation 31)\n
                              • (49) fstrcond (f-value for equation 32)\n
                              • (50) fiooic (f-value for equation 33)\n
                              • (51) fvdump (f-value for equation 34)\n
                              • (52) vdalw\n
                              • (53) fjprot (f-value for equation 35)\n
                              • (54) ftmargtf (f-value for equation 36)\n
                              • (55) NOT USED\n
                              • (56) tdmptf\n
                              • (57) thkcas\n
                              • (58) thwcndut\n
                              • (59) fcutfsu\n
                              • (60) cpttf\n
                              • (61) dr_shld_vv_gap_inboard\n
                              • (62) fdtmp (f-value for equation 38)\n
                              • (63) ftpeak (f-value for equation 39)\n
                              • (64) fauxmn (f-value for equation 40)\n
                              • (65) t_current_ramp_up\n
                              • (66) ft_current_ramp_up (f-value for equation 41)\n
                              • (67) ftcycl (f-value for equation 42)\n
                              • (68) fptemp (f-value for equation 44)\n
                              • (69) rcool\n
                              • (70) vcool\n
                              • (71) fq (f-value for equation 45)\n
                              • (72) fipir (f-value for equation 46)\n
                              • (73) dr_fw_plasma_gap_inboard\n
                              • (74) dr_fw_plasma_gap_outboard\n
                              • (75) tfootfi\n
                              • (76) NOT USED\n
                              • (77) NOT USED\n
                              • (78) NOT USED\n
                              • (79) fbetap (f-value for equation 48)\n
                              • (80) NOT USED\n
                              • (81) edrive\n
                              • (82) drveff\n
                              • (83) tgain\n
                              • (84) chrad\n
                              • (85) pdrive\n
                              • (86) frrmax (f-value for equation 50)\n
                              • (87) NOT USED\n
                              • (88) NOT USED\n
                              • (89) ftbr (f-value for equation 52)\n
                              • (90) blbuith\n
                              • (91) blbuoth\n
                              • (92) fflutf (f-value for equation 53)\n
                              • (93) dr_shld_inboard\n
                              • (94) dr_shld_outboard\n
                              • (95) fptfnuc (f-value for equation 54)\n
                              • (96) fvvhe (f-value for equation 55)\n
                              • (97) fpsepr (f-value for equation 56)\n
                              • (98) li6enrich\n
                              • (99) NOT USED\n
                              • (100) NOT USED\n
                              • (101) NOT USED\n
                              • (102) fimpvar\n
                              • (103) fl_h_threshold (f-value for equation 15)\n
                              • (104)fr_conducting_wall (f-value for equation 23)\n
                              • (105) fnbshinef (f-value for equation 59)\n
                              • (106) ftmargoh (f-value for equation 60)\n
                              • (107) favail (f-value for equation 61)\n
                              • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
                              • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
                              • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
                              • (111) fniterpump: f-value for constraint that number\n
                              • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
                              • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
                              • (114) len_fw_channel: Length of a single first wall channel\n
                              • (115) fpoloidalpower: f-value for max rate of change of\n
                              • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
                              • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
                              • (118) fpsep: f-value to ensure separatrix power is less than\n
                              • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
                              • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
                              • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
                              • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
                              • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
                              • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
                              • (125) fimp(3) : Beryllium density fraction relative to electron density\n
                              • (126) fimp(4) : Carbon density fraction relative to electron density\n
                              • (127) fimp(5) : Nitrogen fraction relative to electron density\n
                              • (128) fimp(6) : Oxygen density fraction relative to electron density\n
                              • (129) fimp(7) : Neon density fraction relative to electron density\n
                              • (130) fimp(8) : Silicon density fraction relative to electron density\n
                              • (131) fimp(9) : Argon density fraction relative to electron density\n
                              • (132) fimp(10) : Iron density fraction relative to electron density\n
                              • (133) fimp(11) : Nickel density fraction relative to electron density\n
                              • (134) fimp(12) : Krypton density fraction relative to electron density\n
                              • (135) fimp(13) : Xenon density fraction relative to electron density\n
                              • (136) fimp(14) : Tungsten density fraction relative to electron density\n
                              • (137) fplhsep (f-value for equation 73)\n
                              • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
                              • (139) copper_thick : thickness of copper layer in tape (m)\n
                              • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
                              • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
                              • (142) nesep : electron density at separatrix [m-3]\n
                              • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
                              • (144) fnesep : Eich critical electron density at separatrix\n
                              • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
                              • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
                              • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
                              • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
                              • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
                              • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
                              • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
                              • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
                              • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
                              • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
                              • (157) fvssu : F-value for available to required start up flux (con. 51)\n
                              • (158) croco_thick : Thickness of CroCo copper tube (m)\n
                              • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
                              • (160) f_avspace (f-value for equation 83)\n
                              • (161) fbeta_min (f-value for equation 84)\n
                              • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
                              • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
                              • (164) f_crypmw : f-value for cryogenic plant power\n
                              • (165) fstr_wp : f-value for TF coil strain absolute value\n
                              • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
                              • (167) fecrh_ignition: f-value for equation 90\n
                              • (168) EMPTY : Description\n
                              • (169) EMPTY : Description\n
                              • (170) EMPTY : Description\n
                              • (171) EMPTY : Description\n
                              • (172) EMPTY : Description\n
                              • (173) EMPTY : Description\n
                              • (174) EMPTY : Description\n
                              • (175) EMPTY : Description\n\n\n\n", "lambda_EU": "Decay length in EUROFER [cm]", "lambda_He_VV": "Decay length [cm]", "lambda_n_BZ_IB": "Decay length in IB BZ [cm]", @@ -12565,7 +12565,7 @@ "lb": 0.0, "ub": 1.0 }, - "fcohbop": { + "f_j_cs_start_pulse_end_flat_top": { "lb": 0.0, "ub": 1.0 }, @@ -15218,7 +15218,7 @@ "lb": 0.001, "ub": 1.0 }, - "fcohbop": { + "f_j_cs_start_pulse_end_flat_top": { "lb": 0.001, "ub": 1.0 }, @@ -15742,7 +15742,7 @@ "fbeta_max": 1.0, "fbeta_min": 1.0, "fb_cs_limit_max": 13.0, - "fcohbop": 0.9, + "f_j_cs_start_pulse_end_flat_top": 0.9, "fcoolcp": 0.3, "fcpttf": 1.0, "fcqt": 1.0, @@ -16377,7 +16377,7 @@ }, "41": { "lb": 0.001, - "name": "fcohbop", + "name": "f_j_cs_start_pulse_end_flat_top", "ub": 1.0 }, "42": { @@ -16756,7 +16756,7 @@ "39": "fjohc0", "4": "te", "40": "fgamcd", - "41": "fcohbop", + "41": "f_j_cs_start_pulse_end_flat_top", "42": "dr_cs_tf_gap", "44": "fvsbrnni", "45": "fqval", @@ -16843,7 +16843,7 @@ "fbeta_max": "36", "fbeta_min": "161", "fb_cs_limit_max": "149", - "fcohbop": "41", + "f_j_cs_start_pulse_end_flat_top": "41", "fcoolcp": "23", "fcpttf": "146", "fcqt": "141", @@ -18944,7 +18944,7 @@ "c_pf_cs_coil_pulse_end_ma", "etapsu", "f_j_cs_start_end_flat_top", - "fcohbop", + "f_j_cs_start_pulse_end_flat_top", "fcuohsu", "fcupfsu", "fvssu", @@ -20250,7 +20250,7 @@ "fcap0": "real_variable", "fcap0cp": "real_variable", "fcdfuel": "real_variable", - "fcohbop": "real_variable", + "f_j_cs_start_pulse_end_flat_top": "real_variable", "fcontng": "real_variable", "fcoolcp": "real_variable", "f_a_tf_cool_outboard": "real_variable", @@ -20913,7 +20913,7 @@ }, "IFAIL_SUCCESS": 1, "NON_F_VALUES": [ - "fcohbop", + "f_j_cs_start_pulse_end_flat_top", "fvsbrnni", "feffcd", "fcutfsu" diff --git a/tests/integration/test_pfcoil_int.py b/tests/integration/test_pfcoil_int.py index b1153a9b28..80bbc9a58f 100644 --- a/tests/integration/test_pfcoil_int.py +++ b/tests/integration/test_pfcoil_int.py @@ -61,7 +61,7 @@ def test_pfcoil(monkeypatch, pfcoil): monkeypatch.setattr(pfv, "c_pf_cs_coil_flat_top_ma", np.full(22, 0.0)) monkeypatch.setattr(pfv, "n_cs_pf_coils", 0) monkeypatch.setattr(pfv, "r_pf_coil_outer_max", 0.0) - monkeypatch.setattr(pfv, "fcohbop", 1.0) + monkeypatch.setattr(pfv, "f_j_cs_start_pulse_end_flat_top", 1.0) monkeypatch.setattr(pfv, "j_pf_coil_wp_peak", np.full(22, 1.1e7)) monkeypatch.setattr(pfv, "n_pf_coil_groups", 4) monkeypatch.setattr(pfv, "r_cs_middle", 3.0) @@ -287,7 +287,6 @@ def test_efc(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): :type monkeypatch: MonkeyPatch """ n_pf_groups_max = 10 - n_pf_coils_in_group_max = 2 nptsmx = 32 nfixmx = 64 lrow1 = 2 * nptsmx + n_pf_groups_max @@ -414,14 +413,6 @@ def test_efc(pfcoil: PFCoil, monkeypatch: pytest.MonkeyPatch): bfix = np.full(lrow1, 0.0) gmat = np.full([lrow1, lcol1], 0.0, order="F") bvec = np.full(lrow1, 0.0) - rc = np.full(n_pf_coils_in_group_max, 0.0) - zc = np.full(n_pf_coils_in_group_max, 0.0) - cc = np.full(n_pf_coils_in_group_max, 0.0) - xc = np.full(n_pf_coils_in_group_max, 0.0) - umat = np.full([lrow1, lcol1], 0.0, order="F") - vmat = np.full([lrow1, lcol1], 0.0, order="F") - sigma = np.full(n_pf_groups_max, 0.0) - work2 = np.full(n_pf_groups_max, 0.0) ssq, ccls = pfcoil.efc( npts, @@ -1642,9 +1633,7 @@ def test_solv(pfcoil: PFCoil): gmat = np.full((3, 3), 2.0, order="F") bvec = np.full(3, 1.0) - ccls = pfcoil.solv( - n_pf_groups_max, n_pf_coil_groups, nrws, gmat, bvec - ) + ccls = pfcoil.solv(n_pf_groups_max, n_pf_coil_groups, nrws, gmat, bvec) assert_array_almost_equal(ccls, np.array([-0.069036, 0.488642, 0.080394])) diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 4cacca413f..0b28522c22 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -113,10 +113,10 @@ fjohc = 0.6 *--------------------------------------------------* icc = 27 ixc = 39 * fjohc0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top boundu(39) = 1.0 fjohc0 = 0.6 -fcohbop = 0.9 +f_j_cs_start_pulse_end_flat_top = 0.9 * I_op/I_Crit TF coil limit * *---------------------------* diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 9c9893fccf..26cdd3cb63 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -84,7 +84,7 @@ fjohc = 1.0 *--------------------------------------------------* icc = 27 fjohc0 = 1.0 -fcohbop = 1.0 +f_j_cs_start_pulse_end_flat_top = 1.0 * I_op/I_Crit TF coil limit * *---------------------------* diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index 8f8097db93..893eebffac 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -57,7 +57,7 @@ boundl(18) = 3.0 ixc = 29 * dr_bore boundl(29) = 0.1 ixc = 37 * j_cs_flat_top_end -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top ixc = 44 * fvsbrnni ixc = 56 * tdmptf ixc = 57 * thkcas @@ -281,7 +281,7 @@ epsvmc = 1e-7 * epsvmc /1;0e-6/ ; error tolerance for VMCON alstroh = 7.5d8 * allowable hoop stress in Central Solenoid structural material (Pa) j_cs_flat_top_end = 21443595.371072624 * Central solenoid overall current density at end of flat-top (A/m2) (`iteration variable 37`) (`sweep variable 62`) c_pf_coil_turn_peak_input = 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4, 4.0d4 * peak current per turn input for PF coil i (A) -fcohbop = 0.93491189654662 * ratio of central solenoid overall current density at beginning of pulse / end of flat-top +f_j_cs_start_pulse_end_flat_top = 0.93491189654662 * ratio of central solenoid overall current density at beginning of pulse / end of flat-top fcuohsu = 0.70 * copper fraction of strand in central solenoid i_pf_location = 2,2,3,3 * Switch for location of PF coil group i; i_cs_superconductor = 1 * switch for superconductor material in central solenoid; diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 5f2b6a9c22..c693737da0 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -1793,7 +1793,7 @@ i_pf_conductor = 0 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *ixc = 41 -*fcohbop = +*f_j_cs_start_pulse_end_flat_top = *boundl(41) = *boundu(41) = * DESCRIPTION: Ratio of central solenoid overall current density at beginning of pulse / end of flat-top diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 6155868eb8..bec25666fc 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -113,10 +113,10 @@ fjohc = 0.6 *--------------------------------------------------* icc = 27 ixc = 39 * fjohc0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top boundu(39) = 1.0 fjohc0 = 0.6 -fcohbop = 0.9 +f_j_cs_start_pulse_end_flat_top = 0.9 * I_op/I_Crit TF coil limit * *---------------------------* diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index d2bff34ea8..bfd59fffbc 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -61,9 +61,9 @@ fjohc0__________________________________________________________________ (itvar013)____________________ 5.4340E-01 fjohc0_(final_value/initial_value)______________________________________ (xcm013)______________________ 9.0567E-01 fjohc0_(range_normalised)_______________________________________________ (nitvar013)___________________ 5.4294E-01 - fcohbop_________________________________________________________________ (itvar014)____________________ 9.4577E-01 - fcohbop_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0509E+00 - fcohbop_(range_normalised)______________________________________________ (nitvar014)___________________ 9.4572E-01 + f_j_cs_start_pulse_end_flat_top_________________________________________________________________ (itvar014)____________________ 9.4577E-01 + f_j_cs_start_pulse_end_flat_top_(final_value/initial_value)_____________________________________ (xcm014)______________________ 1.0509E+00 + f_j_cs_start_pulse_end_flat_top_(range_normalised)______________________________________________ (nitvar014)___________________ 9.4572E-01 fiooic__________________________________________________________________ (itvar015)____________________ 7.1458E-01 fiooic_(final_value/initial_value)______________________________________ (xcm015)______________________ 1.0993E+00 fiooic_(range_normalised)_______________________________________________ (nitvar015)___________________ 7.1429E-01 @@ -873,7 +873,7 @@ # Volt Second Consumption # Total_volt-second_consumption_by_coils_(Wb)_____________________________ (vs_cs_pf_total_pulse)_______________________ -5.7000E+02 OP # Waveforms # - Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (fcohbop)_____________________ 9.4577E-01 ITV + Ratio_of_central_solenoid_current_at_beginning_of_Pulse_/_end_of_flat-to (f_j_cs_start_pulse_end_flat_top)_____________________ 9.4577E-01 ITV Ratio_of_central_solenoid_current_at_beginning_of_Flat-top_/_end_of_flat (f_j_cs_start_end_flat_top)_____________________ -1.3540E-01 OP # PF Circuit Waveform Data # Number_of_PF_circuits_including_CS_and_plasma___________________________ (n_pf_cs_plasma_circuits)_______________________ 8 @@ -1304,10 +1304,10 @@ fjohc = 0.6 *--------------------------------------------------* icc = 27 ixc = 39 * fjohc0 -ixc = 41 * fcohbop +ixc = 41 * f_j_cs_start_pulse_end_flat_top boundu(39) = 1.0 fjohc0 = 0.6 -fcohbop = 0.9 +f_j_cs_start_pulse_end_flat_top = 0.9 * I_op/I_Crit TF coil limit * *---------------------------* From 8c1f833856b2e6011c82871c037571ec05d2ecd6 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 19 Feb 2025 14:46:42 +0000 Subject: [PATCH 66/70] =?UTF-8?q?=F0=9F=94=84=20Rename=20'fvssu'=20to=20'f?= =?UTF-8?q?vs=5Fcs=5Fpf=5Ftotal=5Framp'=20for=20clarity=20and=20consistenc?= =?UTF-8?q?y=20across=20multiple=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/fortran/constraint_equations.f90 | 4 ++-- source/fortran/input.f90 | 6 +++--- source/fortran/iteration_variables.f90 | 12 ++++++------ source/fortran/numerics.f90 | 2 +- source/fortran/pfcoil_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 24 ++++++++++++------------ 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 51b005c59c..a473ae3f0d 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2163,7 +2163,7 @@ subroutine constraint_eqn_051(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! vs_plasma_ind_ramp : input real : internal and external plasma inductance V-s (Wb)) !! vs_cs_pf_total_ramp : input real : total flux swing for startup (Wb) use physics_variables, only: vs_plasma_res_ramp, vs_plasma_ind_ramp - use pfcoil_variables, only: vs_cs_pf_total_ramp, fvssu + use pfcoil_variables, only: vs_cs_pf_total_ramp, fvs_cs_pf_total_ramp implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -2171,7 +2171,7 @@ subroutine constraint_eqn_051(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 - fvssu * abs((vs_plasma_res_ramp+vs_plasma_ind_ramp) / vs_cs_pf_total_ramp) + tmp_cc = 1.0D0 - fvs_cs_pf_total_ramp * abs((vs_plasma_res_ramp+vs_plasma_ind_ramp) / vs_cs_pf_total_ramp) tmp_con = vs_cs_pf_total_ramp * (1.0D0 - tmp_cc) tmp_err = vs_cs_pf_total_ramp * tmp_cc tmp_symbol = '=' diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index c28109774f..90ad844640 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -296,7 +296,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) use numerics, only: factor, boundl, minmax, neqns, nvar, epsfcn, ixc, & epsvmc, ftol, ipnvars, ioptimz, nineqns, ipeqns, boundu, icc, ipnfoms, name_xc use pfcoil_variables, only: rhopfbus, j_pf_coil_wp_peak, zref, fcuohsu, f_a_cs_steel, f_a_pf_coil_void, & - j_cs_flat_top_end, sigpfcalw, alstroh, i_pf_conductor, fcupfsu, fvssu, etapsu, i_cs_stress, & + j_cs_flat_top_end, sigpfcalw, alstroh, i_pf_conductor, fcupfsu, fvs_cs_pf_total_ramp, etapsu, i_cs_stress, & fb_cs_limit_max, ngc, rpf2, f_j_cs_start_pulse_end_flat_top, f_z_cs_tf_internal, f_a_cs_void, i_cs_superconductor, n_pf_groups_max, ngc2, rpf1, & n_pf_coil_groups, i_pf_superconductor, nfxfh, alfapf, routr, sigpfcf, rho_pf_coil, b_cs_limit_max, & n_pf_coils_in_group, nfixmx, c_pf_coil_turn_peak_input, i_pf_location, i_sup_pf_shape, rref, i_pf_current, & @@ -951,8 +951,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('fvs') call parse_real_variable('fvs', fvs, 0.001D0, 10.0D0, & 'F-value for startup V-s requirement') - case ('fvssu') - call parse_real_variable('fvssu', fvssu, 0.001D0, 10.0D0, & + case ('fvs_cs_pf_total_ramp') + call parse_real_variable('fvs_cs_pf_total_ramp', fvs_cs_pf_total_ramp, 0.001D0, 10.0D0, & 'F-value for start up V-s requirement and availability equality') case ('fvvhe') call parse_real_variable('fvvhe', fvvhe, 0.001D0, 10.0D0, & diff --git a/source/fortran/iteration_variables.f90 b/source/fortran/iteration_variables.f90 index d40199fba1..c48d440383 100755 --- a/source/fortran/iteration_variables.f90 +++ b/source/fortran/iteration_variables.f90 @@ -3476,25 +3476,25 @@ end subroutine set_itv_156 !--------------------------------- subroutine init_itv_157 - !!
                              • (157) fvssu : F-value for available to required start up flux (con. 51) + !!
                              • (157) fvs_cs_pf_total_ramp : F-value for available to required start up flux (con. 51) use numerics, only: lablxc, boundl, boundu implicit none - lablxc(157) = 'fvssu ' + lablxc(157) = 'fvs_cs_pf_total_ramp ' boundl(157) = 1.00d-3 boundu(157) = 1.000d1 end subroutine init_itv_157 real(kind(1.d0)) function itv_157() - use pfcoil_variables, only: fvssu + use pfcoil_variables, only: fvs_cs_pf_total_ramp implicit none - itv_157 = fvssu + itv_157 = fvs_cs_pf_total_ramp end function itv_157 subroutine set_itv_157(ratio) - use pfcoil_variables, only: fvssu + use pfcoil_variables, only: fvs_cs_pf_total_ramp implicit none real(kind(1.d0)) :: ratio - fvssu = ratio + fvs_cs_pf_total_ramp = ratio end subroutine set_itv_157 !--------------------------------- diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index eea06bde3e..d0bafbe486 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -360,7 +360,7 @@ module numerics !!
                              • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81) !!
                              • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only) !!
                              • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only) - !!
                              • (157) fvssu : F-value for available to required start up flux (con. 51) + !!
                              • (157) fvs_cs_pf_total_ramp : F-value for available to required start up flux (con. 51) !!
                              • (158) croco_thick : Thickness of CroCo copper tube (m) !!
                              • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82) !!
                              • (160) f_avspace (f-value for equation 83) diff --git a/source/fortran/pfcoil_variables.f90 b/source/fortran/pfcoil_variables.f90 index 6deb7a9d8d..01312fc6e1 100644 --- a/source/fortran/pfcoil_variables.f90 +++ b/source/fortran/pfcoil_variables.f90 @@ -111,7 +111,7 @@ module pfcoil_variables real(dp) :: fcupfsu !! copper fraction of cable conductor (PF coils) - real(dp) :: fvssu + real(dp) :: fvs_cs_pf_total_ramp !! F-value for `constraint equation 51` integer, dimension(n_pf_groups_max) :: i_pf_location @@ -442,7 +442,7 @@ subroutine init_pfcoil_variables f_j_cs_start_pulse_end_flat_top = 0.9D0 fcuohsu = 0.7D0 fcupfsu = 0.69D0 - fvssu = 1.0 + fvs_cs_pf_total_ramp = 1.0 i_pf_location = (/2,2,3,0,0,0,0,0,0,0/) i_pf_conductor = 0 itr_sum = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 4987d3c612..d75d109281 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2060,7 +2060,7 @@ "fvolso": 0.64, "fvs": 1.0, "fvsbrnni": 1.0, - "fvssu": 1.0, + "fvs_cs_pf_total_ramp": 1.0, "fvvhe": 1.0, "fw_armour_mass": 0.0, "fw_armour_thickness": 0.005, @@ -9652,7 +9652,7 @@ "fvolso": "area coverage factor for outboard shield volume", "fvs": "f-value for flux-swing (V-s) requirement (STEADY STATE)\n (`constraint equation 12`, `iteration variable 15`)", "fvsbrnni": "fraction of the plasma current produced by non-inductive means (`iteration variable 44`)", - "fvssu": "F-value for `constraint equation 51`", + "fvs_cs_pf_total_ramp": "F-value for `constraint equation 51`", "fvvhe": "f-value for vacuum vessel He concentration limit (`i_blanket_type = 2`)\n (`constraint equation 55`, `iteration variable 96`)", "fw_armour_mass": "first wall armour mass (kg)", "fw_armour_thickness": "first wall armour thickness (m)", @@ -9956,8 +9956,8 @@ "ksic": "power fraction for outboard double-null scrape-off plasma", "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)
                                  \n
                                  \n
                                • ( 1) Beta (consistency equation) (itv 5)\n
                                • ( 2) Global power balance (consistency equation) (itv 10,1,2,3,4,6,11)\n
                                • ( 3) Ion power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
                                • ( 4) Electron power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
                                • ( 5) Density upper limit (itv 9,1,2,3,4,5,6)\n
                                • ( 6) (Epsilon x beta poloidal) upper limit (itv 8,1,2,3,4,6)\n
                                • ( 7) Beam ion density (NBI) (consistency equation) (itv 7)\n
                                • ( 8) Neutron wall load upper limit (itv 14,1,2,3,4,6)\n
                                • ( 9) Fusion power upper limit (itv 26,1,2,3,4,6)\n
                                • (10) Toroidal field 1/R (consistency equation) (itv 12,1,2,3,13 )\n
                                • (11) Radial build (consistency equation) (itv 3,1,13,16,29,42,61)\n
                                • (12) Volt second lower limit (STEADY STATE) (itv 15,1,2,3)\n
                                • (13) Burn time lower limit (PULSE) (itv 21,1,16,17,29,42,44,61)\n (itv 19,1,2,3,6)\n
                                • (14) Neutral beam decay lengths to plasma centre (NBI) (consistency equation)\n
                                • (15) LH power threshold limit (itv 103)\n
                                • (16) Net electric power lower limit (itv 25,1,2,3)\n
                                • (17) Radiation fraction upper limit (itv 28)\n
                                • (18) Divertor heat load upper limit (itv 27)\n
                                • (19) MVA upper limit (itv 30)\n
                                • (20) Neutral beam tangency radius upper limit (NBI) (itv 33,31,3,13)\n
                                • (21) Plasma minor radius lower limit (itv 32)\n
                                • (22) Divertor collisionality upper limit (itv 34,43)\n
                                • (23) Conducting shell to plasma minor radius ratio upper limit\n (itv 104,1,74)\n
                                • (24) Beta upper limit (itv 36,1,2,3,4,6,18)\n
                                • (25) Peak toroidal field upper limit (itv 35,3,13,29)\n
                                • (26) Central solenoid EOF current density upper limit (i_pf_conductor=0)\n (itv 38,37,41,12)\n
                                • (27) Central solenoid BOP current density upper limit (i_pf_conductor=0)\n (itv 39,37,41,12)\n
                                • (28) Fusion gain Q lower limit (itv 45,47,40)\n
                                • (29) Inboard radial build consistency (itv 3,1,13,16,29,42,61)\n
                                • (30) Injection power upper limit (itv 46,47,11)\n
                                • (31) TF coil case stress upper limit (SCTF) (itv 48,56,57,58,59,60,24)\n
                                • (32) TF coil conduit stress upper limit (SCTF) (itv 49,56,57,58,59,60,24)\n
                                • (33) I_op / I_critical (TF coil) (SCTF) (itv 50,56,57,58,59,60,24)\n
                                • (34) Dump voltage upper limit (SCTF) (itv 51,52,56,57,58,59,60,24)\n
                                • (35) J_winding pack/J_protection upper limit (SCTF) (itv 53,56,57,58,59,60,24)\n
                                • (36) TF coil temperature margin lower limit (SCTF) (itv 54,55,56,57,58,59,60,24)\n
                                • (37) Current drive gamma upper limit (itv 40,47)\n
                                • (38) First wall coolant temperature rise upper limit (itv 62)\n
                                • (39) First wall peak temperature upper limit (itv 63)\n
                                • (40) Start-up injection power lower limit (PULSE) (itv 64)\n
                                • (41) Plasma current ramp-up time lower limit (PULSE) (itv 66,65)\n
                                • (42) Cycle time lower limit (PULSE) (itv 17,67,65)\n
                                • (43) Average centrepost temperature\n (TART) (consistency equation) (itv 13,20,69,70)\n
                                • (44) Peak centrepost temperature upper limit (TART) (itv 68,69,70)\n
                                • (45) Edge safety factor lower limit (TART) (itv 71,1,2,3)\n
                                • (46) Equation for Ip/Irod upper limit (TART) (itv 72,2,60)\n
                                • (47) NOT USED\n
                                • (48) Poloidal beta upper limit (itv 79,2,3,18)\n
                                • (49) NOT USED\n
                                • (50) IFE repetition rate upper limit (IFE)\n
                                • (51) Startup volt-seconds consistency (PULSE) (itv 16,29,3,1)\n
                                • (52) Tritium breeding ratio lower limit (itv 89,90,91)\n
                                • (53) Neutron fluence on TF coil upper limit (itv 92,93,94)\n
                                • (54) Peak TF coil nuclear heating upper limit (itv 95,93,94)\n
                                • (55) Vacuum vessel helium concentration upper limit i_blanket_type =2 (itv 96,93,94)\n
                                • (56) Pseparatrix/Rmajor upper limit (itv 97,1,3)\n
                                • (57) NOT USED\n
                                • (58) NOT USED\n
                                • (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 )\n
                                • (60) Central solenoid temperature margin lower limit (SCTF) (itv 106)\n
                                • (61) Minimum availability value (itv 107)\n
                                • (62) f_alpha_energy_confinement the ratio of particle to energy confinement times (itv 110)\n
                                • (63) The number of ITER-like vacuum pumps niterpump < tfno (itv 111)\n
                                • (64) Zeff less than or equal to zeffmax (itv 112)\n
                                • (65) Dump time set by VV loads (itv 56, 113)\n
                                • (66) Limit on rate of change of energy in poloidal field\n (Use iteration variable 65(t_current_ramp_up), 115)\n
                                • (67) Simple Radiation Wall load limit (itv 116, 4,6)\n
                                • (68) Psep * Bt / qAR upper limit (itv 117)\n
                                • (69) ensure separatrix power = the value from Kallenbach divertor (itv 118)\n
                                • (70) ensure that teomp = separatrix temperature in the pedestal profile,\n (itv 119 (tesep))\n
                                • (71) ensure that neomp = separatrix density (nesep) x neratio\n
                                • (72) central solenoid shear stress limit (Tresca yield criterion) (itv 123 foh_stress)\n
                                • (73) Psep >= Plh + Paux (itv 137 (fplhsep))\n
                                • (74) TFC quench < tmax_croco (itv 141 (fcqt))\n
                                • (75) TFC current/copper area < Maximum (itv 143 f_coppera_m2)\n
                                • (76) Eich critical separatrix density\n
                                • (77) TF coil current per turn upper limit\n
                                • (78) Reinke criterion impurity fraction lower limit (itv 147 freinke)\n
                                • (79) Peak CS field upper limit (itv 149 fb_cs_limit_max)\n
                                • (80) Divertor power lower limit pdivt (itv 153 fpdivlim)\n
                                • (81) Ne(0) > ne(ped) constraint (itv 154 fne0)\n
                                • (82) toroidalgap > tftort constraint (itv 171 ftoroidalgap)\n
                                • (83) Radial build consistency for stellarators (itv 172 f_avspace)\n
                                • (84) Lower limit for beta (itv 173 fbeta_min)\n
                                • (85) Constraint for CP lifetime\n
                                • (86) Constraint for TF coil turn dimension\n
                                • (87) Constraint for cryogenic power\n
                                • (88) Constraint for TF coil strain absolute value\n
                                • (89) Constraint for CS coil quench protection\n
                                • (90) Checking if the design point is ECRH ignitable (itv 164 fecrh_ignition)
                                \n\n\n\n", "lablmm": "lablmm(ipnfoms) : labels describing figures of merit:
                                  \n
                                  \n
                                • ( 1) major radius\n
                                • ( 2) not used\n
                                • ( 3) neutron wall load\n
                                • ( 4) P_tf + P_pf\n
                                • ( 5) fusion gain Q\n
                                • ( 6) cost of electricity\n
                                • ( 7) capital cost (direct cost if ireactor=0,\n constructed cost otherwise)\n
                                • ( 8) aspect ratio\n
                                • ( 9) divertor heat load\n
                                • (10) toroidal field\n
                                • (11) total injected power\n
                                • (12) hydrogen plant capital cost OBSOLETE\n
                                • (13) hydrogen production rate OBSOLETE\n
                                • (14) pulse length\n
                                • (15) plant availability factor (N.B. requires\n iavail=1 to be set)\n
                                • (16) linear combination of major radius (minimised) and pulse length (maximised)\n note: FoM should be minimised only!\n
                                • (17) net electrical output\n
                                • (18) Null Figure of Merit\n
                                • (19) linear combination of big Q and pulse length (maximised)\n note: FoM should be minimised only!
                                \n\n\n", - "lablxc": "lablxc(ipnvars) : labels describing iteration variables
                                  \n
                                  \n
                                • ( 1) aspect\n
                                • ( 2) bt\n
                                • ( 3) rmajor\n
                                • ( 4) te\n
                                • ( 5) beta\n
                                • ( 6) dene\n
                                • ( 7) f_nd_beam_electron\n
                                • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
                                • ( 9) fdene (f-value for equation 5)\n
                                • (10) hfact\n
                                • (11) pheat\n
                                • (12) oacdcp\n
                                • (13) dr_tf_inboard (NOT RECOMMENDED)\n
                                • (14) fwalld (f-value for equation 8)\n
                                • (15) fvs (f-value for equation 12)\n
                                • (16) dr_cs\n
                                • (17) tdwell\n
                                • (18) q\n
                                • (19) beam_energy\n
                                • (20) temp_cp_average\n
                                • (21) ftburn (f-value for equation 13)\n
                                • (22) NOT USED\n
                                • (23) fcoolcp\n
                                • (24) NOT USED\n
                                • (25) fpnetel (f-value for equation 16)\n
                                • (26) ffuspow (f-value for equation 9)\n
                                • (27) fhldiv (f-value for equation 18)\n
                                • (28) fradpwr (f-value for equation 17), total radiation fraction\n
                                • (29) dr_bore\n
                                • (30) fmva (f-value for equation 19)\n
                                • (31) gapomin\n
                                • (32) frminor (f-value for equation 21)\n
                                • (33) fportsz (f-value for equation 20)\n
                                • (34) fdivcol (f-value for equation 22)\n
                                • (35) fpeakb (f-value for equation 25)\n
                                • (36) fbeta_max (f-value for equation 24)\n
                                • (37) j_cs_flat_top_end\n
                                • (38) fjohc (f-value for equation 26)\n
                                • (39) fjohc0 (f-value for equation 27)\n
                                • (40) fgamcd (f-value for equation 37)\n
                                • (41) f_j_cs_start_pulse_end_flat_top\n
                                • (42) dr_cs_tf_gap\n
                                • (43) NOT USED\n
                                • (44) fvsbrnni\n
                                • (45) fqval (f-value for equation 28)\n
                                • (46) fpinj (f-value for equation 30)\n
                                • (47) feffcd\n
                                • (48) fstrcase (f-value for equation 31)\n
                                • (49) fstrcond (f-value for equation 32)\n
                                • (50) fiooic (f-value for equation 33)\n
                                • (51) fvdump (f-value for equation 34)\n
                                • (52) vdalw\n
                                • (53) fjprot (f-value for equation 35)\n
                                • (54) ftmargtf (f-value for equation 36)\n
                                • (55) NOT USED\n
                                • (56) tdmptf\n
                                • (57) thkcas\n
                                • (58) thwcndut\n
                                • (59) fcutfsu\n
                                • (60) cpttf\n
                                • (61) dr_shld_vv_gap_inboard\n
                                • (62) fdtmp (f-value for equation 38)\n
                                • (63) ftpeak (f-value for equation 39)\n
                                • (64) fauxmn (f-value for equation 40)\n
                                • (65) tohs\n
                                • (66) ftohs (f-value for equation 41)\n
                                • (67) ftcycl (f-value for equation 42)\n
                                • (68) fptemp (f-value for equation 44)\n
                                • (69) rcool\n
                                • (70) vcool\n
                                • (71) fq (f-value for equation 45)\n
                                • (72) fipir (f-value for equation 46)\n
                                • (73) dr_fw_plasma_gap_inboard\n
                                • (74) dr_fw_plasma_gap_outboard\n
                                • (75) tfootfi\n
                                • (76) NOT USED\n
                                • (77) NOT USED\n
                                • (78) NOT USED\n
                                • (79) fbeta_poloidal (f-value for equation 48)\n
                                • (80) NOT USED\n
                                • (81) edrive\n
                                • (82) drveff\n
                                • (83) tgain\n
                                • (84) chrad\n
                                • (85) pdrive\n
                                • (86) frrmax (f-value for equation 50)\n
                                • (87) NOT USED\n
                                • (88) NOT USED\n
                                • (89) ftbr (f-value for equation 52)\n
                                • (90) blbuith\n
                                • (91) blbuoth\n
                                • (92) fflutf (f-value for equation 53)\n
                                • (93) dr_shld_inboard\n
                                • (94) dr_shld_outboard\n
                                • (95) fptfnuc (f-value for equation 54)\n
                                • (96) fvvhe (f-value for equation 55)\n
                                • (97) fpsepr (f-value for equation 56)\n
                                • (98) li6enrich\n
                                • (99) NOT USED\n
                                • (100) NOT USED\n
                                • (101) NOT USED\n
                                • (102) fimpvar\n
                                • (103) fl_h_threshold (f-value for equation 15)\n
                                • (104)fr_conducting_wall (f-value for equation 23)\n
                                • (105) fnbshinef (f-value for equation 59)\n
                                • (106) ftmargoh (f-value for equation 60)\n
                                • (107) favail (f-value for equation 61)\n
                                • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
                                • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
                                • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
                                • (111) fniterpump: f-value for constraint that number\n
                                • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
                                • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
                                • (114) len_fw_channel: Length of a single first wall channel\n
                                • (115) fpoloidalpower: f-value for max rate of change of\n
                                • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
                                • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
                                • (118) fpsep: f-value to ensure separatrix power is less than\n
                                • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
                                • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
                                • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
                                • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
                                • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
                                • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
                                • (125) fimp(3) : Beryllium density fraction relative to electron density\n
                                • (126) fimp(4) : Carbon density fraction relative to electron density\n
                                • (127) fimp(5) : Nitrogen fraction relative to electron density\n
                                • (128) fimp(6) : Oxygen density fraction relative to electron density\n
                                • (129) fimp(7) : Neon density fraction relative to electron density\n
                                • (130) fimp(8) : Silicon density fraction relative to electron density\n
                                • (131) fimp(9) : Argon density fraction relative to electron density\n
                                • (132) fimp(10) : Iron density fraction relative to electron density\n
                                • (133) fimp(11) : Nickel density fraction relative to electron density\n
                                • (134) fimp(12) : Krypton density fraction relative to electron density\n
                                • (135) fimp(13) : Xenon density fraction relative to electron density\n
                                • (136) fimp(14) : Tungsten density fraction relative to electron density\n
                                • (137) fplhsep (f-value for equation 73)\n
                                • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
                                • (139) copper_thick : thickness of copper layer in tape (m)\n
                                • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
                                • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
                                • (142) nesep : electron density at separatrix [m-3]\n
                                • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
                                • (144) fnesep : Eich critical electron density at separatrix\n
                                • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
                                • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
                                • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
                                • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
                                • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
                                • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
                                • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
                                • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
                                • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
                                • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
                                • (157) fvssu : F-value for available to required start up flux (con. 51)\n
                                • (158) croco_thick : Thickness of CroCo copper tube (m)\n
                                • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
                                • (160) f_avspace (f-value for equation 83)\n
                                • (161) fbeta_min (f-value for equation 84)\n
                                • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
                                • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
                                • (164) f_crypmw : f-value for cryogenic plant power\n
                                • (165) fstr_wp : f-value for TF coil strain absolute value\n
                                • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
                                • (167) fecrh_ignition: f-value for equation 90\n
                                • (168) EMPTY : Description\n
                                • (169) EMPTY : Description\n
                                • (170) EMPTY : Description\n
                                • (171) EMPTY : Description\n
                                • (172) EMPTY : Description\n
                                • (173) EMPTY : Description\n
                                • (174) EMPTY : Description\n
                                • (175) EMPTY : Description\n\n\n\n", - "lablxc": "lablxc(ipnvars) : labels describing iteration variables
                                    \n
                                    \n
                                  • ( 1) aspect\n
                                  • ( 2) bt\n
                                  • ( 3) rmajor\n
                                  • ( 4) te\n
                                  • ( 5) beta\n
                                  • ( 6) dene\n
                                  • ( 7) f_nd_beam_electron\n
                                  • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
                                  • ( 9) fdene (f-value for equation 5)\n
                                  • (10) hfact\n
                                  • (11) pheat\n
                                  • (12) oacdcp\n
                                  • (13) dr_tf_inboard (NOT RECOMMENDED)\n
                                  • (14) fwalld (f-value for equation 8)\n
                                  • (15) fvs (f-value for equation 12)\n
                                  • (16) dr_cs\n
                                  • (17) t_between_pulse\n
                                  • (18) q\n
                                  • (19) beam_energy\n
                                  • (20) temp_cp_average\n
                                  • (21) ft_burn (f-value for equation 13)\n
                                  • (22) NOT USED\n
                                  • (23) fcoolcp\n
                                  • (24) NOT USED\n
                                  • (25) fpnetel (f-value for equation 16)\n
                                  • (26) ffuspow (f-value for equation 9)\n
                                  • (27) fhldiv (f-value for equation 18)\n
                                  • (28) fradpwr (f-value for equation 17), total radiation fraction\n
                                  • (29) dr_bore\n
                                  • (30) fmva (f-value for equation 19)\n
                                  • (31) gapomin\n
                                  • (32) frminor (f-value for equation 21)\n
                                  • (33) fportsz (f-value for equation 20)\n
                                  • (34) fdivcol (f-value for equation 22)\n
                                  • (35) fpeakb (f-value for equation 25)\n
                                  • (36) fbeta_max (f-value for equation 24)\n
                                  • (37) j_cs_flat_top_end\n
                                  • (38) fjohc (f-value for equation 26)\n
                                  • (39) fjohc0 (f-value for equation 27)\n
                                  • (40) fgamcd (f-value for equation 37)\n
                                  • (41) f_j_cs_start_pulse_end_flat_top\n
                                  • (42) dr_cs_tf_gap\n
                                  • (43) NOT USED\n
                                  • (44) fvsbrnni\n
                                  • (45) fqval (f-value for equation 28)\n
                                  • (46) fpinj (f-value for equation 30)\n
                                  • (47) feffcd\n
                                  • (48) fstrcase (f-value for equation 31)\n
                                  • (49) fstrcond (f-value for equation 32)\n
                                  • (50) fiooic (f-value for equation 33)\n
                                  • (51) fvdump (f-value for equation 34)\n
                                  • (52) vdalw\n
                                  • (53) fjprot (f-value for equation 35)\n
                                  • (54) ftmargtf (f-value for equation 36)\n
                                  • (55) NOT USED\n
                                  • (56) tdmptf\n
                                  • (57) thkcas\n
                                  • (58) thwcndut\n
                                  • (59) fcutfsu\n
                                  • (60) cpttf\n
                                  • (61) dr_shld_vv_gap_inboard\n
                                  • (62) fdtmp (f-value for equation 38)\n
                                  • (63) ftpeak (f-value for equation 39)\n
                                  • (64) fauxmn (f-value for equation 40)\n
                                  • (65) t_current_ramp_up\n
                                  • (66) ft_current_ramp_up (f-value for equation 41)\n
                                  • (67) ftcycl (f-value for equation 42)\n
                                  • (68) fptemp (f-value for equation 44)\n
                                  • (69) rcool\n
                                  • (70) vcool\n
                                  • (71) fq (f-value for equation 45)\n
                                  • (72) fipir (f-value for equation 46)\n
                                  • (73) dr_fw_plasma_gap_inboard\n
                                  • (74) dr_fw_plasma_gap_outboard\n
                                  • (75) tfootfi\n
                                  • (76) NOT USED\n
                                  • (77) NOT USED\n
                                  • (78) NOT USED\n
                                  • (79) fbetap (f-value for equation 48)\n
                                  • (80) NOT USED\n
                                  • (81) edrive\n
                                  • (82) drveff\n
                                  • (83) tgain\n
                                  • (84) chrad\n
                                  • (85) pdrive\n
                                  • (86) frrmax (f-value for equation 50)\n
                                  • (87) NOT USED\n
                                  • (88) NOT USED\n
                                  • (89) ftbr (f-value for equation 52)\n
                                  • (90) blbuith\n
                                  • (91) blbuoth\n
                                  • (92) fflutf (f-value for equation 53)\n
                                  • (93) dr_shld_inboard\n
                                  • (94) dr_shld_outboard\n
                                  • (95) fptfnuc (f-value for equation 54)\n
                                  • (96) fvvhe (f-value for equation 55)\n
                                  • (97) fpsepr (f-value for equation 56)\n
                                  • (98) li6enrich\n
                                  • (99) NOT USED\n
                                  • (100) NOT USED\n
                                  • (101) NOT USED\n
                                  • (102) fimpvar\n
                                  • (103) fl_h_threshold (f-value for equation 15)\n
                                  • (104)fr_conducting_wall (f-value for equation 23)\n
                                  • (105) fnbshinef (f-value for equation 59)\n
                                  • (106) ftmargoh (f-value for equation 60)\n
                                  • (107) favail (f-value for equation 61)\n
                                  • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
                                  • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
                                  • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
                                  • (111) fniterpump: f-value for constraint that number\n
                                  • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
                                  • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
                                  • (114) len_fw_channel: Length of a single first wall channel\n
                                  • (115) fpoloidalpower: f-value for max rate of change of\n
                                  • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
                                  • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
                                  • (118) fpsep: f-value to ensure separatrix power is less than\n
                                  • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
                                  • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
                                  • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
                                  • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
                                  • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
                                  • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
                                  • (125) fimp(3) : Beryllium density fraction relative to electron density\n
                                  • (126) fimp(4) : Carbon density fraction relative to electron density\n
                                  • (127) fimp(5) : Nitrogen fraction relative to electron density\n
                                  • (128) fimp(6) : Oxygen density fraction relative to electron density\n
                                  • (129) fimp(7) : Neon density fraction relative to electron density\n
                                  • (130) fimp(8) : Silicon density fraction relative to electron density\n
                                  • (131) fimp(9) : Argon density fraction relative to electron density\n
                                  • (132) fimp(10) : Iron density fraction relative to electron density\n
                                  • (133) fimp(11) : Nickel density fraction relative to electron density\n
                                  • (134) fimp(12) : Krypton density fraction relative to electron density\n
                                  • (135) fimp(13) : Xenon density fraction relative to electron density\n
                                  • (136) fimp(14) : Tungsten density fraction relative to electron density\n
                                  • (137) fplhsep (f-value for equation 73)\n
                                  • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
                                  • (139) copper_thick : thickness of copper layer in tape (m)\n
                                  • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
                                  • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
                                  • (142) nesep : electron density at separatrix [m-3]\n
                                  • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
                                  • (144) fnesep : Eich critical electron density at separatrix\n
                                  • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
                                  • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
                                  • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
                                  • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
                                  • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
                                  • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
                                  • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
                                  • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
                                  • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
                                  • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
                                  • (157) fvssu : F-value for available to required start up flux (con. 51)\n
                                  • (158) croco_thick : Thickness of CroCo copper tube (m)\n
                                  • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
                                  • (160) f_avspace (f-value for equation 83)\n
                                  • (161) fbeta_min (f-value for equation 84)\n
                                  • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
                                  • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
                                  • (164) f_crypmw : f-value for cryogenic plant power\n
                                  • (165) fstr_wp : f-value for TF coil strain absolute value\n
                                  • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
                                  • (167) fecrh_ignition: f-value for equation 90\n
                                  • (168) EMPTY : Description\n
                                  • (169) EMPTY : Description\n
                                  • (170) EMPTY : Description\n
                                  • (171) EMPTY : Description\n
                                  • (172) EMPTY : Description\n
                                  • (173) EMPTY : Description\n
                                  • (174) EMPTY : Description\n
                                  • (175) EMPTY : Description\n\n\n\n", + "lablxc": "lablxc(ipnvars) : labels describing iteration variables
                                      \n
                                      \n
                                    • ( 1) aspect\n
                                    • ( 2) bt\n
                                    • ( 3) rmajor\n
                                    • ( 4) te\n
                                    • ( 5) beta\n
                                    • ( 6) dene\n
                                    • ( 7) f_nd_beam_electron\n
                                    • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
                                    • ( 9) fdene (f-value for equation 5)\n
                                    • (10) hfact\n
                                    • (11) pheat\n
                                    • (12) oacdcp\n
                                    • (13) dr_tf_inboard (NOT RECOMMENDED)\n
                                    • (14) fwalld (f-value for equation 8)\n
                                    • (15) fvs (f-value for equation 12)\n
                                    • (16) dr_cs\n
                                    • (17) tdwell\n
                                    • (18) q\n
                                    • (19) beam_energy\n
                                    • (20) temp_cp_average\n
                                    • (21) ftburn (f-value for equation 13)\n
                                    • (22) NOT USED\n
                                    • (23) fcoolcp\n
                                    • (24) NOT USED\n
                                    • (25) fpnetel (f-value for equation 16)\n
                                    • (26) ffuspow (f-value for equation 9)\n
                                    • (27) fhldiv (f-value for equation 18)\n
                                    • (28) fradpwr (f-value for equation 17), total radiation fraction\n
                                    • (29) dr_bore\n
                                    • (30) fmva (f-value for equation 19)\n
                                    • (31) gapomin\n
                                    • (32) frminor (f-value for equation 21)\n
                                    • (33) fportsz (f-value for equation 20)\n
                                    • (34) fdivcol (f-value for equation 22)\n
                                    • (35) fpeakb (f-value for equation 25)\n
                                    • (36) fbeta_max (f-value for equation 24)\n
                                    • (37) j_cs_flat_top_end\n
                                    • (38) fjohc (f-value for equation 26)\n
                                    • (39) fjohc0 (f-value for equation 27)\n
                                    • (40) fgamcd (f-value for equation 37)\n
                                    • (41) f_j_cs_start_pulse_end_flat_top\n
                                    • (42) dr_cs_tf_gap\n
                                    • (43) NOT USED\n
                                    • (44) fvsbrnni\n
                                    • (45) fqval (f-value for equation 28)\n
                                    • (46) fpinj (f-value for equation 30)\n
                                    • (47) feffcd\n
                                    • (48) fstrcase (f-value for equation 31)\n
                                    • (49) fstrcond (f-value for equation 32)\n
                                    • (50) fiooic (f-value for equation 33)\n
                                    • (51) fvdump (f-value for equation 34)\n
                                    • (52) vdalw\n
                                    • (53) fjprot (f-value for equation 35)\n
                                    • (54) ftmargtf (f-value for equation 36)\n
                                    • (55) NOT USED\n
                                    • (56) tdmptf\n
                                    • (57) thkcas\n
                                    • (58) thwcndut\n
                                    • (59) fcutfsu\n
                                    • (60) cpttf\n
                                    • (61) dr_shld_vv_gap_inboard\n
                                    • (62) fdtmp (f-value for equation 38)\n
                                    • (63) ftpeak (f-value for equation 39)\n
                                    • (64) fauxmn (f-value for equation 40)\n
                                    • (65) tohs\n
                                    • (66) ftohs (f-value for equation 41)\n
                                    • (67) ftcycl (f-value for equation 42)\n
                                    • (68) fptemp (f-value for equation 44)\n
                                    • (69) rcool\n
                                    • (70) vcool\n
                                    • (71) fq (f-value for equation 45)\n
                                    • (72) fipir (f-value for equation 46)\n
                                    • (73) dr_fw_plasma_gap_inboard\n
                                    • (74) dr_fw_plasma_gap_outboard\n
                                    • (75) tfootfi\n
                                    • (76) NOT USED\n
                                    • (77) NOT USED\n
                                    • (78) NOT USED\n
                                    • (79) fbeta_poloidal (f-value for equation 48)\n
                                    • (80) NOT USED\n
                                    • (81) edrive\n
                                    • (82) drveff\n
                                    • (83) tgain\n
                                    • (84) chrad\n
                                    • (85) pdrive\n
                                    • (86) frrmax (f-value for equation 50)\n
                                    • (87) NOT USED\n
                                    • (88) NOT USED\n
                                    • (89) ftbr (f-value for equation 52)\n
                                    • (90) blbuith\n
                                    • (91) blbuoth\n
                                    • (92) fflutf (f-value for equation 53)\n
                                    • (93) dr_shld_inboard\n
                                    • (94) dr_shld_outboard\n
                                    • (95) fptfnuc (f-value for equation 54)\n
                                    • (96) fvvhe (f-value for equation 55)\n
                                    • (97) fpsepr (f-value for equation 56)\n
                                    • (98) li6enrich\n
                                    • (99) NOT USED\n
                                    • (100) NOT USED\n
                                    • (101) NOT USED\n
                                    • (102) fimpvar\n
                                    • (103) fl_h_threshold (f-value for equation 15)\n
                                    • (104)fr_conducting_wall (f-value for equation 23)\n
                                    • (105) fnbshinef (f-value for equation 59)\n
                                    • (106) ftmargoh (f-value for equation 60)\n
                                    • (107) favail (f-value for equation 61)\n
                                    • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
                                    • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
                                    • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
                                    • (111) fniterpump: f-value for constraint that number\n
                                    • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
                                    • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
                                    • (114) len_fw_channel: Length of a single first wall channel\n
                                    • (115) fpoloidalpower: f-value for max rate of change of\n
                                    • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
                                    • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
                                    • (118) fpsep: f-value to ensure separatrix power is less than\n
                                    • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
                                    • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
                                    • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
                                    • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
                                    • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
                                    • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
                                    • (125) fimp(3) : Beryllium density fraction relative to electron density\n
                                    • (126) fimp(4) : Carbon density fraction relative to electron density\n
                                    • (127) fimp(5) : Nitrogen fraction relative to electron density\n
                                    • (128) fimp(6) : Oxygen density fraction relative to electron density\n
                                    • (129) fimp(7) : Neon density fraction relative to electron density\n
                                    • (130) fimp(8) : Silicon density fraction relative to electron density\n
                                    • (131) fimp(9) : Argon density fraction relative to electron density\n
                                    • (132) fimp(10) : Iron density fraction relative to electron density\n
                                    • (133) fimp(11) : Nickel density fraction relative to electron density\n
                                    • (134) fimp(12) : Krypton density fraction relative to electron density\n
                                    • (135) fimp(13) : Xenon density fraction relative to electron density\n
                                    • (136) fimp(14) : Tungsten density fraction relative to electron density\n
                                    • (137) fplhsep (f-value for equation 73)\n
                                    • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
                                    • (139) copper_thick : thickness of copper layer in tape (m)\n
                                    • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
                                    • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
                                    • (142) nesep : electron density at separatrix [m-3]\n
                                    • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
                                    • (144) fnesep : Eich critical electron density at separatrix\n
                                    • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
                                    • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
                                    • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
                                    • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
                                    • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
                                    • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
                                    • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
                                    • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
                                    • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
                                    • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
                                    • (157) fvs_cs_pf_total_ramp : F-value for available to required start up flux (con. 51)\n
                                    • (158) croco_thick : Thickness of CroCo copper tube (m)\n
                                    • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
                                    • (160) f_avspace (f-value for equation 83)\n
                                    • (161) fbeta_min (f-value for equation 84)\n
                                    • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
                                    • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
                                    • (164) f_crypmw : f-value for cryogenic plant power\n
                                    • (165) fstr_wp : f-value for TF coil strain absolute value\n
                                    • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
                                    • (167) fecrh_ignition: f-value for equation 90\n
                                    • (168) EMPTY : Description\n
                                    • (169) EMPTY : Description\n
                                    • (170) EMPTY : Description\n
                                    • (171) EMPTY : Description\n
                                    • (172) EMPTY : Description\n
                                    • (173) EMPTY : Description\n
                                    • (174) EMPTY : Description\n
                                    • (175) EMPTY : Description\n\n\n\n", + "lablxc": "lablxc(ipnvars) : labels describing iteration variables
                                        \n
                                        \n
                                      • ( 1) aspect\n
                                      • ( 2) bt\n
                                      • ( 3) rmajor\n
                                      • ( 4) te\n
                                      • ( 5) beta\n
                                      • ( 6) dene\n
                                      • ( 7) f_nd_beam_electron\n
                                      • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
                                      • ( 9) fdene (f-value for equation 5)\n
                                      • (10) hfact\n
                                      • (11) pheat\n
                                      • (12) oacdcp\n
                                      • (13) dr_tf_inboard (NOT RECOMMENDED)\n
                                      • (14) fwalld (f-value for equation 8)\n
                                      • (15) fvs (f-value for equation 12)\n
                                      • (16) dr_cs\n
                                      • (17) t_between_pulse\n
                                      • (18) q\n
                                      • (19) beam_energy\n
                                      • (20) temp_cp_average\n
                                      • (21) ft_burn (f-value for equation 13)\n
                                      • (22) NOT USED\n
                                      • (23) fcoolcp\n
                                      • (24) NOT USED\n
                                      • (25) fpnetel (f-value for equation 16)\n
                                      • (26) ffuspow (f-value for equation 9)\n
                                      • (27) fhldiv (f-value for equation 18)\n
                                      • (28) fradpwr (f-value for equation 17), total radiation fraction\n
                                      • (29) dr_bore\n
                                      • (30) fmva (f-value for equation 19)\n
                                      • (31) gapomin\n
                                      • (32) frminor (f-value for equation 21)\n
                                      • (33) fportsz (f-value for equation 20)\n
                                      • (34) fdivcol (f-value for equation 22)\n
                                      • (35) fpeakb (f-value for equation 25)\n
                                      • (36) fbeta_max (f-value for equation 24)\n
                                      • (37) j_cs_flat_top_end\n
                                      • (38) fjohc (f-value for equation 26)\n
                                      • (39) fjohc0 (f-value for equation 27)\n
                                      • (40) fgamcd (f-value for equation 37)\n
                                      • (41) f_j_cs_start_pulse_end_flat_top\n
                                      • (42) dr_cs_tf_gap\n
                                      • (43) NOT USED\n
                                      • (44) fvsbrnni\n
                                      • (45) fqval (f-value for equation 28)\n
                                      • (46) fpinj (f-value for equation 30)\n
                                      • (47) feffcd\n
                                      • (48) fstrcase (f-value for equation 31)\n
                                      • (49) fstrcond (f-value for equation 32)\n
                                      • (50) fiooic (f-value for equation 33)\n
                                      • (51) fvdump (f-value for equation 34)\n
                                      • (52) vdalw\n
                                      • (53) fjprot (f-value for equation 35)\n
                                      • (54) ftmargtf (f-value for equation 36)\n
                                      • (55) NOT USED\n
                                      • (56) tdmptf\n
                                      • (57) thkcas\n
                                      • (58) thwcndut\n
                                      • (59) fcutfsu\n
                                      • (60) cpttf\n
                                      • (61) dr_shld_vv_gap_inboard\n
                                      • (62) fdtmp (f-value for equation 38)\n
                                      • (63) ftpeak (f-value for equation 39)\n
                                      • (64) fauxmn (f-value for equation 40)\n
                                      • (65) t_current_ramp_up\n
                                      • (66) ft_current_ramp_up (f-value for equation 41)\n
                                      • (67) ftcycl (f-value for equation 42)\n
                                      • (68) fptemp (f-value for equation 44)\n
                                      • (69) rcool\n
                                      • (70) vcool\n
                                      • (71) fq (f-value for equation 45)\n
                                      • (72) fipir (f-value for equation 46)\n
                                      • (73) dr_fw_plasma_gap_inboard\n
                                      • (74) dr_fw_plasma_gap_outboard\n
                                      • (75) tfootfi\n
                                      • (76) NOT USED\n
                                      • (77) NOT USED\n
                                      • (78) NOT USED\n
                                      • (79) fbetap (f-value for equation 48)\n
                                      • (80) NOT USED\n
                                      • (81) edrive\n
                                      • (82) drveff\n
                                      • (83) tgain\n
                                      • (84) chrad\n
                                      • (85) pdrive\n
                                      • (86) frrmax (f-value for equation 50)\n
                                      • (87) NOT USED\n
                                      • (88) NOT USED\n
                                      • (89) ftbr (f-value for equation 52)\n
                                      • (90) blbuith\n
                                      • (91) blbuoth\n
                                      • (92) fflutf (f-value for equation 53)\n
                                      • (93) dr_shld_inboard\n
                                      • (94) dr_shld_outboard\n
                                      • (95) fptfnuc (f-value for equation 54)\n
                                      • (96) fvvhe (f-value for equation 55)\n
                                      • (97) fpsepr (f-value for equation 56)\n
                                      • (98) li6enrich\n
                                      • (99) NOT USED\n
                                      • (100) NOT USED\n
                                      • (101) NOT USED\n
                                      • (102) fimpvar\n
                                      • (103) fl_h_threshold (f-value for equation 15)\n
                                      • (104)fr_conducting_wall (f-value for equation 23)\n
                                      • (105) fnbshinef (f-value for equation 59)\n
                                      • (106) ftmargoh (f-value for equation 60)\n
                                      • (107) favail (f-value for equation 61)\n
                                      • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
                                      • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
                                      • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
                                      • (111) fniterpump: f-value for constraint that number\n
                                      • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
                                      • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
                                      • (114) len_fw_channel: Length of a single first wall channel\n
                                      • (115) fpoloidalpower: f-value for max rate of change of\n
                                      • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
                                      • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
                                      • (118) fpsep: f-value to ensure separatrix power is less than\n
                                      • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
                                      • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
                                      • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
                                      • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
                                      • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
                                      • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
                                      • (125) fimp(3) : Beryllium density fraction relative to electron density\n
                                      • (126) fimp(4) : Carbon density fraction relative to electron density\n
                                      • (127) fimp(5) : Nitrogen fraction relative to electron density\n
                                      • (128) fimp(6) : Oxygen density fraction relative to electron density\n
                                      • (129) fimp(7) : Neon density fraction relative to electron density\n
                                      • (130) fimp(8) : Silicon density fraction relative to electron density\n
                                      • (131) fimp(9) : Argon density fraction relative to electron density\n
                                      • (132) fimp(10) : Iron density fraction relative to electron density\n
                                      • (133) fimp(11) : Nickel density fraction relative to electron density\n
                                      • (134) fimp(12) : Krypton density fraction relative to electron density\n
                                      • (135) fimp(13) : Xenon density fraction relative to electron density\n
                                      • (136) fimp(14) : Tungsten density fraction relative to electron density\n
                                      • (137) fplhsep (f-value for equation 73)\n
                                      • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
                                      • (139) copper_thick : thickness of copper layer in tape (m)\n
                                      • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
                                      • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
                                      • (142) nesep : electron density at separatrix [m-3]\n
                                      • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
                                      • (144) fnesep : Eich critical electron density at separatrix\n
                                      • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
                                      • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
                                      • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
                                      • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
                                      • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
                                      • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
                                      • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
                                      • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
                                      • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
                                      • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
                                      • (157) fvs_cs_pf_total_ramp : F-value for available to required start up flux (con. 51)\n
                                      • (158) croco_thick : Thickness of CroCo copper tube (m)\n
                                      • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
                                      • (160) f_avspace (f-value for equation 83)\n
                                      • (161) fbeta_min (f-value for equation 84)\n
                                      • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
                                      • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
                                      • (164) f_crypmw : f-value for cryogenic plant power\n
                                      • (165) fstr_wp : f-value for TF coil strain absolute value\n
                                      • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
                                      • (167) fecrh_ignition: f-value for equation 90\n
                                      • (168) EMPTY : Description\n
                                      • (169) EMPTY : Description\n
                                      • (170) EMPTY : Description\n
                                      • (171) EMPTY : Description\n
                                      • (172) EMPTY : Description\n
                                      • (173) EMPTY : Description\n
                                      • (174) EMPTY : Description\n
                                      • (175) EMPTY : Description\n\n\n\n", "lambda_EU": "Decay length in EUROFER [cm]", "lambda_He_VV": "Decay length [cm]", "lambda_n_BZ_IB": "Decay length in IB BZ [cm]", @@ -12977,7 +12977,7 @@ "lb": 0.0, "ub": 1.0 }, - "fvssu": { + "fvs_cs_pf_total_ramp": { "lb": 0.001, "ub": 10.0 }, @@ -15522,7 +15522,7 @@ "lb": 0.001, "ub": 1.0 }, - "fvssu": { + "fvs_cs_pf_total_ramp": { "lb": 0.001, "ub": 10.0 }, @@ -15806,7 +15806,7 @@ "fvdump": 1.0, "fvs": 1.0, "fvsbrnni": 1.0, - "fvssu": 1.0, + "fvs_cs_pf_total_ramp": 1.0, "fvvhe": 1.0, "len_fw_channel": 4.0, "fwalld": 1.0, @@ -16152,7 +16152,7 @@ }, "157": { "lb": 0.001, - "name": "fvssu", + "name": "fvs_cs_pf_total_ramp", "ub": 10.0 }, "158": { @@ -16711,7 +16711,7 @@ "154": "fne0", "155": "pfusife", "156": "rrin", - "157": "fvssu", + "157": "fvs_cs_pf_total_ramp", "158": "croco_thick", "159": "ftoroidalgap", "16": "dr_cs", @@ -16919,7 +16919,7 @@ "fvdump": "51", "fvs": "15", "fvsbrnni": "44", - "fvssu": "157", + "fvs_cs_pf_total_ramp": "157", "fvvhe": "96", "len_fw_channel": "114", "fwalld": "14", @@ -18947,7 +18947,7 @@ "f_j_cs_start_pulse_end_flat_top", "fcuohsu", "fcupfsu", - "fvssu", + "fvs_cs_pf_total_ramp", "i_pf_location", "i_pf_conductor", "itr_sum", @@ -20353,7 +20353,7 @@ "fvolso": "real_variable", "fvs": "real_variable", "fvsbrnni": "real_variable", - "fvssu": "real_variable", + "fvs_cs_pf_total_ramp": "real_variable", "fvvhe": "real_variable", "fw_armour_thickness": "real_variable", "len_fw_channel": "real_variable", From e792db32e83380fcef669ed737e7d7c4feb9991f Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 19 Feb 2025 14:51:57 +0000 Subject: [PATCH 67/70] Remove large_tokamak.IN.DAT:Zone.Identifier --- large_tokamak.IN.DAT:Zone.Identifier | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 large_tokamak.IN.DAT:Zone.Identifier diff --git a/large_tokamak.IN.DAT:Zone.Identifier b/large_tokamak.IN.DAT:Zone.Identifier deleted file mode 100644 index e69de29bb2..0000000000 From a7462303936cdb04a0fa0624c7fd318c824e972e Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 19 Feb 2025 15:04:10 +0000 Subject: [PATCH 68/70] =?UTF-8?q?=F0=9F=94=84=20Add=20new=20variable=20map?= =?UTF-8?q?pings=20for=20clarity=20and=20consistency=20in=20obsolete=5Fvar?= =?UTF-8?q?s.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/io/obsolete_vars.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 3a01de38f2..5563453846 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -214,6 +214,25 @@ "tfwmatmax": "temp_fw_max", "fw_channel_length": "len_fw_channel", "denw": None, + "rjconpf": "j_pf_coil_wp_peak", + "oh_steel_frac": "f_a_cs_steel", + "vf": "f_a_pf_coil_void", + "coheof": "j_cs_lat_top_end", + "ipfres": "i_pf_conductor", + "fvssu": "fvs_cs_pf_total_ramp", + "fbmaxcs": "fb_cs_limit_max", + "fcohbop": "f_j_cs_start_pulse_end_flat_top", + "ohhghf": "f_z_cs_tf_internal", + "vfohc": "f_a_cs_void", + "isumatoh": "i_cs_superconductor", + "ngrpmx": "n_pf+groups_max", + "ngrp": "n_pf_coil_groups", + "isumatpf": "i_pf_superconductor", + "pfclres": "rho_pf_coil", + "bmaxcs_lim": "b_cs_limit_max", + "ncls": "n_pf_coils_in_group", + "cptdin": "c_pf_coil_turn_peak_input", + "ipfloc": "i_pf_location", } OBS_VARS_HELP = { From e2dfcf274ebf098660f5b3e9148eefc505e54078 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 6 Mar 2025 09:46:52 +0000 Subject: [PATCH 69/70] :fire: Remove wrongly committed file --- st_regression.IN.DAT:Zone.Identifier | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 st_regression.IN.DAT:Zone.Identifier diff --git a/st_regression.IN.DAT:Zone.Identifier b/st_regression.IN.DAT:Zone.Identifier deleted file mode 100644 index e69de29bb2..0000000000 From b9d81662e5c63d997e3f2573f966bb081839d2ba Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 6 Mar 2025 14:57:37 +0000 Subject: [PATCH 70/70] =?UTF-8?q?=F0=9F=94=84=20Increase=20label=20array?= =?UTF-8?q?=20size=20and=20rename=20PF=20coil=20variables=20for=20clarity?= =?UTF-8?q?=20and=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/fortran/numerics.f90 | 2 +- .../input_files/spherical_tokamak_once_through.IN.DAT | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index d0bafbe486..94d7ae6a6a 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -202,7 +202,7 @@ module numerics !! array defining which iteration variables to activate !! (see lablxc for descriptions) - character*30, dimension(ipnvars) :: lablxc + character*50, dimension(ipnvars) :: lablxc !! lablxc(ipnvars) : labels describing iteration variables
                                          !!
                                        • ( 1) aspect !!
                                        • ( 2) bt diff --git a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT index 21a4bb15b4..ac1aa36bb7 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -299,12 +299,12 @@ epsvmc = 1.0e-11 * epsvmc /1;0e-6/ ; error tolerance for VMCON *-----------------Pfcoil Variables-----------------* -ipfloc = 2,3,3,4 * Switch for location of PF coil group i; -ipfres = 0 * switch for PF & CS coil conductor type; -isumatpf = 9 * switch for superconductor material in PF coils; +i_pf_location = 2,3,3,4 * Switch for location of PF coil group i; +i_pf_conductor = 0 * switch for PF & CS coil conductor type; +i_pf_superconductor = 9 * switch for superconductor material in PF coils; i_sup_pf_shape = 1 * Switch for the placement of Location 3 (outboard) PF coils -ncls = 2,2,2,2 * number of PF coils in group j -ngrp = 4 * number of groups of PF coils; Symmetric coil pairs should all be in the same group +n_pf_coils_in_group = 2,2,2,2 * number of PF coils in group j +n_pf_coil_groups = 4 * number of groups of PF coils; Symmetric coil pairs should all be in the same group rref = 7.0D0, 7.0D0, 7.0D0, 2.0, 7.0D0, 7.0D0, 7.0D0, 7.0D0, 7.0D0, 7.0D0 * PF coil radial positioning adjuster; zref(1) = 3.6 zref(2) = 1.2