Skip to content

Replaced local calculated eps variable with fortran variable as input #3102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkovari merged 1 commit into from
Mar 14, 2024
Merged

Replaced local calculated eps variable with fortran variable as input #3102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions process/physics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,9 @@ def nui(j, zmain, ni, tempi, amain):


@nb.jit(nopython=True, cache=True)
def _plascar_bpol(aspect, kappa, delta):
def _plascar_bpol(aspect, eps, kappa, delta):
# Original coding, only suitable for TARTs [STAR Code]

eps = 1.0 / aspect

c1 = kappa**2 / (1.0 + delta) + delta
c2 = kappa**2 / (1.0 - delta) - delta

Expand Down Expand Up @@ -117,7 +115,7 @@ def _plascar_bpol(aspect, kappa, delta):


@nb.jit(nopython=True, cache=True)
def bpol(icurr, ip, qbar, aspect, bt, kappa, delta, perim, rmu0):
def bpol(icurr, ip, qbar, aspect, eps, bt, kappa, delta, perim, rmu0):
"""Function to calculate poloidal field
author: J Galambos, FEDC/ORNL
author: P J Knight, CCFE, Culham Science Centre
Expand All @@ -141,13 +139,13 @@ def bpol(icurr, ip, qbar, aspect, bt, kappa, delta, perim, rmu0):
if icurr != 2:
return rmu0 * ip / perim

ff1, ff2, _, _ = _plascar_bpol(aspect, kappa, delta)
ff1, ff2, _, _ = _plascar_bpol(aspect, eps, kappa, delta)

return bt * (ff1 + ff2) / (2.0 * np.pi * qbar)


@nb.jit(nopython=True, cache=True)
def plasc(qbar, aspect, rminor, bt, kappa, delta):
def plasc(qbar, aspect, eps, rminor, bt, kappa, delta):
"""Function to calculate plasma current (Peng scaling)
author: J Galambos, FEDC/ORNL
author: P J Knight, CCFE, Culham Science Centre
Expand All @@ -167,7 +165,7 @@ def plasc(qbar, aspect, rminor, bt, kappa, delta):
Fusion Technology, 21, 1729
"""

ff1, ff2, d1, d2 = _plascar_bpol(aspect, kappa, delta)
ff1, ff2, d1, d2 = _plascar_bpol(aspect, eps, kappa, delta)

e1 = 2.0 * kappa / (d1 * (1.0 + delta))
e2 = 2.0 * kappa / (d2 * (1.0 - delta))
Expand Down Expand Up @@ -2094,7 +2092,7 @@ def culcur(
if icurr == 1: # Peng analytical fit
fq = (1.22 - 0.68 * eps) / ((1.0 - eps * eps) ** 2) * sf**2
elif icurr == 2: # Peng scaling for double null divertor; TARTs [STAR Code]
curhat = 1.0e6 * plasc(qpsi, asp, rminor, bt, kappa, triang) / bt
curhat = 1.0e6 * plasc(qpsi, asp, eps, rminor, bt, kappa, triang) / bt
elif icurr == 3: # Simple ITER scaling (simply the cylindrical case)
fq = 1.0
elif icurr == 4: # ITER formula (IPDG89)
Expand Down Expand Up @@ -2161,7 +2159,9 @@ def culcur(
physics_variables.normalised_total_beta = (
1.0e8 * physics_variables.beta * rminor * bt / plascur
)
bp = bpol(icurr, plascur, qpsi, asp, bt, kappa, triang, pperim, constants.rmu0)
bp = bpol(
icurr, plascur, qpsi, asp, eps, bt, kappa, triang, pperim, constants.rmu0
)

# Ensure current profile consistency, if required
# This is as described in Hartmann and Zohm only if icurr = 4 as well...
Expand Down
5 changes: 5 additions & 0 deletions tests/unit/test_physics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,7 @@ def test_culcur(culcurparam, monkeypatch, physics):
{
"qbar": 2.5,
"aspect": 2.7,
"eps": 0.37037037,
"rminor": 1.5,
"bt": 12,
"kappa": 1.85,
Expand All @@ -653,6 +654,7 @@ def test_culcur(culcurparam, monkeypatch, physics):
{
"qbar": 2.5,
"aspect": 3.0,
"eps": 0.33333333,
"rminor": 1.5,
"bt": 12,
"kappa": 1.85,
Expand All @@ -675,6 +677,7 @@ def test_plasc(arguments, expected):
"ip": 1.6e7,
"qbar": 2.5,
"aspect": 2.7,
"eps": 0.37037037,
"bt": 12,
"kappa": 1.85,
"delta": 0.5,
Expand All @@ -689,6 +692,7 @@ def test_plasc(arguments, expected):
"ip": 1.6e7,
"qbar": 2.5,
"aspect": 3.0,
"eps": 0.33333333,
"bt": 12,
"kappa": 1.85,
"delta": 0.5,
Expand All @@ -703,6 +707,7 @@ def test_plasc(arguments, expected):
"ip": 1.6e7,
"qbar": 2.5,
"aspect": 3.0,
"eps": 0.33333333,
"bt": 12,
"kappa": 1.85,
"delta": 0.5,
Expand Down