From 3deffdb70c1d2ec60df40ec4b3d2f011a4720f92 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 16 Dec 2024 16:11:27 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=84=20Rename=20fbetatry=20to=20fbeta?= =?UTF-8?q?=5Fmax=20for=20consistency=20across=20data=20files=20and=20docu?= =?UTF-8?q?mentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/fusion-devices/stellarator.md | 2 +- .../proc-pages/physics-models/error.txt | 2 +- .../physics-models/plasma_beta/plasma_beta.md | 8 +-- 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/large_tokamak_IN.DAT | 4 +- examples/data/scan_MFILE.DAT | 60 +++++++++---------- examples/data/scan_example_file_IN.DAT | 4 +- source/fortran/constraint_equations.f90 | 20 +++---- source/fortran/constraint_variables.f90 | 4 +- source/fortran/input.f90 | 6 +- source/fortran/iteration_variables.f90 | 12 ++-- source/fortran/numerics.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 | 4 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +- .../data/large_tokamak_once_through.IN.DAT | 2 +- tests/integration/data/ref_IN.DAT | 6 +- tests/integration/data/scan_2D_MFILE.DAT | 4 +- tests/integration/data/scan_MFILE.DAT | 6 +- .../data/uncertainties_nonopt_ref_IN.DAT | 6 +- .../integration/data/uncertainties_ref_IN.DAT | 6 +- tests/integration/ref_dicts.json | 24 ++++---- .../input_files/large_tokamak.IN.DAT | 4 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- .../regression/input_files/stellarator.IN.DAT | 2 +- tests/unit/data/large_tokamak_IN.DAT | 4 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +- 35 files changed, 131 insertions(+), 131 deletions(-) diff --git a/documentation/proc-pages/fusion-devices/stellarator.md b/documentation/proc-pages/fusion-devices/stellarator.md index f45678259..6b5473bb9 100644 --- a/documentation/proc-pages/fusion-devices/stellarator.md +++ b/documentation/proc-pages/fusion-devices/stellarator.md @@ -123,7 +123,7 @@ Stellarators try to achieve zero plasma current in order to allow safe divertor ### Beta limit The stellarator version calculates the plasma beta based on the input parameter and it is thus not necessary to Differently to the tokamak version, -The beta limit is assumed to be 5%, based on 3-D MHD calculations[^7]. To apply the beta limit, constraint equation no. 24 should be turned on with iteration variable no. 36 (`fbetatry`). +The beta limit is assumed to be 5%, based on 3-D MHD calculations[^7]. To apply the beta limit, constraint equation no. 24 should be turned on with iteration variable no. 36 (`fbeta_max`). ### Density limit diff --git a/documentation/proc-pages/physics-models/error.txt b/documentation/proc-pages/physics-models/error.txt index a68ac63c7..ee15da78f 100644 --- a/documentation/proc-pages/physics-models/error.txt +++ b/documentation/proc-pages/physics-models/error.txt @@ -390,7 +390,7 @@ defined with respect to the total equilibrium \(\mathbf{B}\)-field Reactor Study', AEA Fusion Report AEA FUS 172 (1992)}. The beta coefficient \(g\) is set using input parameter \texttt{beta_norm_limit_upper}. To apply the beta limit, constraint equation no. 24 should be turned on with -iteration variable no. 36 (\texttt{fbetatry}). The limit can be applied +iteration variable no. 36 (\texttt{fbeta_max}). The limit can be applied to either the total plasma beta, in which case switch \texttt{iculbl} should be set to 0, to only the thermal component of the plasma beta, in which case \texttt{iculbl} should be set to 1, or to the thermal plus diff --git a/documentation/proc-pages/physics-models/plasma_beta/plasma_beta.md b/documentation/proc-pages/physics-models/plasma_beta/plasma_beta.md index 050f4abb4..5f28e2450 100644 --- a/documentation/proc-pages/physics-models/plasma_beta/plasma_beta.md +++ b/documentation/proc-pages/physics-models/plasma_beta/plasma_beta.md @@ -101,16 +101,16 @@ $$\begin{aligned} where $B_0$ is the axial vacuum toroidal field. The beta coefficient $g$ is set using input parameter `beta_norm_limit_upper`. To apply the beta limit, constraint equation 24 should be turned on with iteration variable 36 -(`fbetatry`). +(`fbeta_max`). By default, $\beta$ is defined with respect to the total equilibrium B-field [^2]. | `i_beta_component` | Description | | :-: | - | -| 0 (default) | Apply the $\beta$ limit to the total plasma beta (including the contribution from fast ions) | +| 0 (default) | Apply the $\beta$ limit to the total plasma beta (including the contribution from fast alphas and neutral beams) | | 1 | Apply the $\beta$ limit to only the thermal component of beta | | 2 | Apply the $\beta$ limit to only the thermal plus neutral beam contributions to beta | -| 3 | Apply the $\beta$ limit to the total beta (including the contribution from fast ions), calculated using only the toroidal field | +| 3 | Apply the $\beta$ limit to the total toroidal beta (including the contribution from fast alphas and neutral beams) | ### Setting the Beta $g$ Coefficient @@ -173,7 +173,7 @@ This constraint can be activated by stating `icc = 24` in the input file. It is the general setting of the $\beta$ limit depending on the $\beta_{\text{N}}$ value calculated in the [beta limit](#beta-limit) calculations. -The upper limit value of beta is calculated by `calculate_beta_limit()`. The scaling value `fbetatry` can be varied also. +The upper limit value of beta is calculated by `calculate_beta_limit()`. The scaling value `fbeta_max` can be varied also. **It is recommended to have this constraint on as it is a plasma stability model** diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index d622126ae..5147c35a8 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -47,9 +47,9 @@ fpnetel_________________________________________________________________ (itvar008)____________________ 1.0000E+00 fpnetel_(final_value/initial_value)_____________________________________ (xcm008)______________________ 1.0000E+00 fpnetel_(range_normalised)______________________________________________ (nitvar008)___________________ 1.0000E+00 - fbetatry________________________________________________________________ (itvar009)____________________ 5.0870E-01 - fbetatry_(final_value/initial_value)____________________________________ (xcm009)______________________ 1.0174E+00 - fbetatry_(range_normalised)_____________________________________________ (nitvar009)___________________ 5.0821E-01 + fbeta_max________________________________________________________________ (itvar009)____________________ 5.0870E-01 + fbeta_max_(final_value/initial_value)____________________________________ (xcm009)______________________ 1.0174E+00 + fbeta_max_(range_normalised)_____________________________________________ (nitvar009)___________________ 5.0821E-01 fpeakb__________________________________________________________________ (itvar010)____________________ 8.6988E-01 fpeakb_(final_value/initial_value)______________________________________ (xcm010)______________________ 8.6988E-01 fpeakb_(range_normalised)_______________________________________________ (nitvar010)___________________ 8.6975E-01 @@ -1278,8 +1278,8 @@ pnetelin = 400.0 * Beta upper limit * *------------------* icc = 24 -ixc = 36 * fbetatry -fbetatry = 0.5 +ixc = 36 * fbeta_max +fbeta_max = 0.5 * Max TF field * *--------------* diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index b3e54ab02..e4d6ab2e7 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -47,9 +47,9 @@ fpnetel_________________________________________________________________ (itvar008)____________________ 1.0000E+00 fpnetel_(final_value/initial_value)_____________________________________ (xcm008)______________________ 1.0000E+00 fpnetel_(range_normalised)______________________________________________ (nitvar008)___________________ 1.0000E+00 - fbetatry________________________________________________________________ (itvar009)____________________ 4.0370E-01 - fbetatry_(final_value/initial_value)____________________________________ (xcm009)______________________ 1.0174E+00 - fbetatry_(range_normalised)_____________________________________________ (nitvar009)___________________ 5.0821E-01 + fbeta_max________________________________________________________________ (itvar009)____________________ 4.0370E-01 + fbeta_max_(final_value/initial_value)____________________________________ (xcm009)______________________ 1.0174E+00 + fbeta_max_(range_normalised)_____________________________________________ (nitvar009)___________________ 5.0821E-01 fpeakb__________________________________________________________________ (itvar010)____________________ 8.5988E-01 fpeakb_(final_value/initial_value)______________________________________ (xcm010)______________________ 8.6988E-01 fpeakb_(range_normalised)_______________________________________________ (nitvar010)___________________ 8.6975E-01 @@ -1278,8 +1278,8 @@ pnetelin = 400.0 * Beta upper limit * *------------------* icc = 24 -ixc = 36 * fbetatry -fbetatry = 0.5 +ixc = 36 * fbeta_max +fbeta_max = 0.5 * Max TF field * *--------------* diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index c06f96014..9adafe3ed 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -47,9 +47,9 @@ fpnetel_________________________________________________________________ (itvar008)____________________ 1.0000E+00 fpnetel_(final_value/initial_value)_____________________________________ (xcm008)______________________ 1.0000E+00 fpnetel_(range_normalised)______________________________________________ (nitvar008)___________________ 1.0000E+00 - fbetatry________________________________________________________________ (itvar009)____________________ 5.0870E-01 - fbetatry_(final_value/initial_value)____________________________________ (xcm009)______________________ 1.0174E+00 - fbetatry_(range_normalised)_____________________________________________ (nitvar009)___________________ 5.0821E-01 + fbeta_max________________________________________________________________ (itvar009)____________________ 5.0870E-01 + fbeta_max_(final_value/initial_value)____________________________________ (xcm009)______________________ 1.0174E+00 + fbeta_max_(range_normalised)_____________________________________________ (nitvar009)___________________ 5.0821E-01 fpeakb__________________________________________________________________ (itvar010)____________________ 8.6988E-01 fpeakb_(final_value/initial_value)______________________________________ (xcm010)______________________ 8.4988E-01 fpeakb_(range_normalised)_______________________________________________ (nitvar010)___________________ 8.6975E-01 @@ -1278,8 +1278,8 @@ pnetelin = 400.0 * Beta upper limit * *------------------* icc = 24 -ixc = 36 * fbetatry -fbetatry = 0.5 +ixc = 36 * fbeta_max +fbeta_max = 0.5 * Max TF field * *--------------* diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index df85fc653..8dea03e3e 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -47,9 +47,9 @@ fpnetel_________________________________________________________________ (itvar008)____________________ 1.7000E+00 fpnetel_(final_value/initial_value)_____________________________________ (xcm008)______________________ 1.0000E+00 fpnetel_(range_normalised)______________________________________________ (nitvar008)___________________ 1.0000E+00 - fbetatry________________________________________________________________ (itvar009)____________________ 5.3870E-01 - fbetatry_(final_value/initial_value)____________________________________ (xcm009)______________________ 1.0174E+00 - fbetatry_(range_normalised)_____________________________________________ (nitvar009)___________________ 5.0821E-01 + fbeta_max________________________________________________________________ (itvar009)____________________ 5.3870E-01 + fbeta_max_(final_value/initial_value)____________________________________ (xcm009)______________________ 1.0174E+00 + fbeta_max_(range_normalised)_____________________________________________ (nitvar009)___________________ 5.0821E-01 fpeakb__________________________________________________________________ (itvar010)____________________ 8.5988E-01 fpeakb_(final_value/initial_value)______________________________________ (xcm010)______________________ 8.4988E-01 fpeakb_(range_normalised)_______________________________________________ (nitvar010)___________________ 8.6975E-01 @@ -1278,8 +1278,8 @@ pnetelin = 400.0 * Beta upper limit * *------------------* icc = 24 -ixc = 36 * fbetatry -fbetatry = 0.5 +ixc = 36 * fbeta_max +fbeta_max = 0.5 * Max TF field * *--------------* diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index fb37e8bce..51807448f 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -90,8 +90,8 @@ pnetelin = 400.0 * Beta upper limit * *------------------* icc = 24 -ixc = 36 * fbetatry -fbetatry = 0.5 +ixc = 36 * fbeta_max +fbeta_max = 0.5 * Max TF field * *--------------* diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index c61025b62..652b4930c 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -56,9 +56,9 @@ bore____________________________________________________________________ (itvar011)____________________ 2.2626E+00 bore_(final_value/initial_value)________________________________________ (xcm011)______________________ 9.7016E-01 bore_(range_normalised)_________________________________________________ (nitvar011)___________________ 2.1845E-01 - fbetatry________________________________________________________________ (itvar012)____________________ 4.7134E-01 - fbetatry_(final_value/initial_value)____________________________________ (xcm012)______________________ 9.7684E-01 - fbetatry_(range_normalised)_____________________________________________ (nitvar012)___________________ 4.7081E-01 + fbeta_max________________________________________________________________ (itvar012)____________________ 4.7134E-01 + fbeta_max_(final_value/initial_value)____________________________________ (xcm012)______________________ 9.7684E-01 + fbeta_max_(range_normalised)_____________________________________________ (nitvar012)___________________ 4.7081E-01 coheof__________________________________________________________________ (itvar013)____________________ 1.2788E+07 coheof_(final_value/initial_value)______________________________________ (xcm013)______________________ 6.1702E-01 coheof_(range_normalised)_______________________________________________ (nitvar013)___________________ 1.2701E-01 @@ -1051,9 +1051,9 @@ bore____________________________________________________________________ (itvar011)____________________ 2.2626E+00 bore_(final_value/initial_value)________________________________________ (xcm011)______________________ 1.0000E+00 bore_(range_normalised)_________________________________________________ (nitvar011)___________________ 2.1845E-01 - fbetatry________________________________________________________________ (itvar012)____________________ 4.7134E-01 - fbetatry_(final_value/initial_value)____________________________________ (xcm012)______________________ 1.0000E+00 - fbetatry_(range_normalised)_____________________________________________ (nitvar012)___________________ 4.7081E-01 + fbeta_max________________________________________________________________ (itvar012)____________________ 4.7134E-01 + fbeta_max_(final_value/initial_value)____________________________________ (xcm012)______________________ 1.0000E+00 + fbeta_max_(range_normalised)_____________________________________________ (nitvar012)___________________ 4.7081E-01 coheof__________________________________________________________________ (itvar013)____________________ 1.2788E+07 coheof_(final_value/initial_value)______________________________________ (xcm013)______________________ 1.0000E+00 coheof_(range_normalised)_______________________________________________ (nitvar013)___________________ 1.2701E-01 @@ -2046,9 +2046,9 @@ bore____________________________________________________________________ (itvar011)____________________ 2.2626E+00 bore_(final_value/initial_value)________________________________________ (xcm011)______________________ 1.0000E+00 bore_(range_normalised)_________________________________________________ (nitvar011)___________________ 2.1845E-01 - fbetatry________________________________________________________________ (itvar012)____________________ 4.7134E-01 - fbetatry_(final_value/initial_value)____________________________________ (xcm012)______________________ 1.0000E+00 - fbetatry_(range_normalised)_____________________________________________ (nitvar012)___________________ 4.7081E-01 + fbeta_max________________________________________________________________ (itvar012)____________________ 4.7134E-01 + fbeta_max_(final_value/initial_value)____________________________________ (xcm012)______________________ 1.0000E+00 + fbeta_max_(range_normalised)_____________________________________________ (nitvar012)___________________ 4.7081E-01 coheof__________________________________________________________________ (itvar013)____________________ 1.2788E+07 coheof_(final_value/initial_value)______________________________________ (xcm013)______________________ 1.0000E+00 coheof_(range_normalised)_______________________________________________ (nitvar013)___________________ 1.2701E-01 @@ -3041,9 +3041,9 @@ bore____________________________________________________________________ (itvar011)____________________ 2.2626E+00 bore_(final_value/initial_value)________________________________________ (xcm011)______________________ 1.0000E+00 bore_(range_normalised)_________________________________________________ (nitvar011)___________________ 2.1845E-01 - fbetatry________________________________________________________________ (itvar012)____________________ 4.7134E-01 - fbetatry_(final_value/initial_value)____________________________________ (xcm012)______________________ 1.0000E+00 - fbetatry_(range_normalised)_____________________________________________ (nitvar012)___________________ 4.7081E-01 + fbeta_max________________________________________________________________ (itvar012)____________________ 4.7134E-01 + fbeta_max_(final_value/initial_value)____________________________________ (xcm012)______________________ 1.0000E+00 + fbeta_max_(range_normalised)_____________________________________________ (nitvar012)___________________ 4.7081E-01 coheof__________________________________________________________________ (itvar013)____________________ 1.2788E+07 coheof_(final_value/initial_value)______________________________________ (xcm013)______________________ 1.0000E+00 coheof_(range_normalised)_______________________________________________ (nitvar013)___________________ 1.2701E-01 @@ -4036,9 +4036,9 @@ bore____________________________________________________________________ (itvar011)____________________ 2.2626E+00 bore_(final_value/initial_value)________________________________________ (xcm011)______________________ 1.0000E+00 bore_(range_normalised)_________________________________________________ (nitvar011)___________________ 2.1845E-01 - fbetatry________________________________________________________________ (itvar012)____________________ 4.7134E-01 - fbetatry_(final_value/initial_value)____________________________________ (xcm012)______________________ 1.0000E+00 - fbetatry_(range_normalised)_____________________________________________ (nitvar012)___________________ 4.7081E-01 + fbeta_max________________________________________________________________ (itvar012)____________________ 4.7134E-01 + fbeta_max_(final_value/initial_value)____________________________________ (xcm012)______________________ 1.0000E+00 + fbeta_max_(range_normalised)_____________________________________________ (nitvar012)___________________ 4.7081E-01 coheof__________________________________________________________________ (itvar013)____________________ 1.2788E+07 coheof_(final_value/initial_value)______________________________________ (xcm013)______________________ 1.0000E+00 coheof_(range_normalised)_______________________________________________ (nitvar013)___________________ 1.2701E-01 @@ -5031,9 +5031,9 @@ bore____________________________________________________________________ (itvar011)____________________ 2.2626E+00 bore_(final_value/initial_value)________________________________________ (xcm011)______________________ 1.0000E+00 bore_(range_normalised)_________________________________________________ (nitvar011)___________________ 2.1845E-01 - fbetatry________________________________________________________________ (itvar012)____________________ 4.7134E-01 - fbetatry_(final_value/initial_value)____________________________________ (xcm012)______________________ 1.0000E+00 - fbetatry_(range_normalised)_____________________________________________ (nitvar012)___________________ 4.7081E-01 + fbeta_max________________________________________________________________ (itvar012)____________________ 4.7134E-01 + fbeta_max_(final_value/initial_value)____________________________________ (xcm012)______________________ 1.0000E+00 + fbeta_max_(range_normalised)_____________________________________________ (nitvar012)___________________ 4.7081E-01 coheof__________________________________________________________________ (itvar013)____________________ 1.2788E+07 coheof_(final_value/initial_value)______________________________________ (xcm013)______________________ 1.0000E+00 coheof_(range_normalised)_______________________________________________ (nitvar013)___________________ 1.2701E-01 @@ -6026,9 +6026,9 @@ bore____________________________________________________________________ (itvar011)____________________ 2.2626E+00 bore_(final_value/initial_value)________________________________________ (xcm011)______________________ 1.0000E+00 bore_(range_normalised)_________________________________________________ (nitvar011)___________________ 2.1845E-01 - fbetatry________________________________________________________________ (itvar012)____________________ 4.7134E-01 - fbetatry_(final_value/initial_value)____________________________________ (xcm012)______________________ 1.0000E+00 - fbetatry_(range_normalised)_____________________________________________ (nitvar012)___________________ 4.7081E-01 + fbeta_max________________________________________________________________ (itvar012)____________________ 4.7134E-01 + fbeta_max_(final_value/initial_value)____________________________________ (xcm012)______________________ 1.0000E+00 + fbeta_max_(range_normalised)_____________________________________________ (nitvar012)___________________ 4.7081E-01 coheof__________________________________________________________________ (itvar013)____________________ 1.2788E+07 coheof_(final_value/initial_value)______________________________________ (xcm013)______________________ 1.0000E+00 coheof_(range_normalised)_______________________________________________ (nitvar013)___________________ 1.2701E-01 @@ -7021,9 +7021,9 @@ bore____________________________________________________________________ (itvar011)____________________ 2.2626E+00 bore_(final_value/initial_value)________________________________________ (xcm011)______________________ 1.0000E+00 bore_(range_normalised)_________________________________________________ (nitvar011)___________________ 2.1845E-01 - fbetatry________________________________________________________________ (itvar012)____________________ 4.7134E-01 - fbetatry_(final_value/initial_value)____________________________________ (xcm012)______________________ 1.0000E+00 - fbetatry_(range_normalised)_____________________________________________ (nitvar012)___________________ 4.7081E-01 + fbeta_max________________________________________________________________ (itvar012)____________________ 4.7134E-01 + fbeta_max_(final_value/initial_value)____________________________________ (xcm012)______________________ 1.0000E+00 + fbeta_max_(range_normalised)_____________________________________________ (nitvar012)___________________ 4.7081E-01 coheof__________________________________________________________________ (itvar013)____________________ 1.2788E+07 coheof_(final_value/initial_value)______________________________________ (xcm013)______________________ 1.0000E+00 coheof_(range_normalised)_______________________________________________ (nitvar013)___________________ 1.2701E-01 @@ -8016,9 +8016,9 @@ bore____________________________________________________________________ (itvar011)____________________ 2.2626E+00 bore_(final_value/initial_value)________________________________________ (xcm011)______________________ 1.0000E+00 bore_(range_normalised)_________________________________________________ (nitvar011)___________________ 2.1845E-01 - fbetatry________________________________________________________________ (itvar012)____________________ 4.7134E-01 - fbetatry_(final_value/initial_value)____________________________________ (xcm012)______________________ 1.0000E+00 - fbetatry_(range_normalised)_____________________________________________ (nitvar012)___________________ 4.7081E-01 + fbeta_max________________________________________________________________ (itvar012)____________________ 4.7134E-01 + fbeta_max_(final_value/initial_value)____________________________________ (xcm012)______________________ 1.0000E+00 + fbeta_max_(range_normalised)_____________________________________________ (nitvar012)___________________ 4.7081E-01 coheof__________________________________________________________________ (itvar013)____________________ 1.2788E+07 coheof_(final_value/initial_value)______________________________________ (xcm013)______________________ 1.0000E+00 coheof_(range_normalised)_______________________________________________ (nitvar013)___________________ 1.2701E-01 @@ -9023,7 +9023,7 @@ ixc = 18 * q boundl(18) = 3.5 ixc = 29 * bore boundl(29) = 0.1 -ixc = 36 * fbetatry +ixc = 36 * fbeta_max ixc = 37 * coheof ixc = 38 * fjohc boundu(38) = 1.0 @@ -9103,7 +9103,7 @@ vvblgap = 0.02 * gap between vacuum vessel and blanket (m) *---------------Constraint Variables---------------* -fbetatry = 0.4815 * F-value for beta limit +fbeta_max = 0.4815 * F-value for beta limit fdene = 1.2 * F-value for density limit ffuspow = 1 * F-value for maximum fusion power fjohc = 0.25 * F-value for central solenoid current at end-of-flattop @@ -9326,7 +9326,7 @@ t_burn = 1.0d4 * Burn time (s) (calculated if lpulse=1) ohcth = 5.5242E-01 q = 3.5000E+00 bore = 2.3322E+00 - fbetatry = 4.8251E-01 + fbeta_max = 4.8251E-01 coheof = 2.0726E+07 fjohc = 5.7941E-01 fjohc0 = 5.3923E-01 diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 7e7995e30..762c3f6d0 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -90,8 +90,8 @@ pnetelin = 400.0 * Beta upper limit * *------------------* icc = 24 -ixc = 36 * fbetatry -fbetatry = 0.5 +ixc = 36 * fbeta_max +fbeta_max = 0.5 * Max TF field * *--------------* diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 528dc13b8..0a19d0bb8 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -1256,7 +1256,7 @@ subroutine constraint_eqn_024(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! residual error in physical units; output string; units string !! Equation for beta upper limit !! #=# physics - !! #=#=# fbetatry, beta_limit_upper + !! #=#=# fbeta_max, beta_limit_upper !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! i_beta_component : input integer : switch for beta limit scaling (constraint equation 24):