Skip to content

remove variables from pacpmw calculation which are already in fcsht calc #3236

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 3 commits into from
Jul 2, 2024
Merged

remove variables from pacpmw calculation which are already in fcsht calc #3236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3641c9
remove variables from pacpmw calculation which are already in fcsht c…
clmould Jul 1, 2024
738c918
update unit tests after changing formula for pacpmw calculation
clmould Jul 1, 2024
31f8ee2
Update stellarator file to converge with new cost gradient
timothy-nunn Jul 2, 2024
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
2 changes: 0 additions & 2 deletions process/power.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,6 @@ def acpow(self, output: bool):
+ heat_transport_variables.htpmw
+ heat_transport_variables.trithtmw
+ pheatingmw
+ basemw
+ buildings_variables.efloor * pkwpm2 / 1000.0e0
)

# Add contribution from motor-generator flywheels if these are part of
Expand Down
4 changes: 2 additions & 2 deletions tests/regression/input_files/stellarator.IN.DAT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ bigqmin = 1 * Minimal BigQ
powfmax = 500. *Maximal Fusion Power
fpnetel = 1. *f-value for net electric power

dene = 2.554e20 *Electron density (/m3)
dene = 2e20 *Electron density (/m3)
*hfact = 1.0 *H-factor on energy confinement times

alphan = 0.35 *Density profile index
Expand All @@ -132,7 +132,7 @@ iradloss = 1 *Switch for radiation loss term usage in power balance (1: Total
isc = 38 *Switch for energy confinement time scaling law (38: ISS04, 49: ISS04-Gyro-Bohm)
kappa = 1.001 *Plasma separatrix elongation
ssync = 0.6 *Synchrotron wall reflectivity factor
te = 8.685715225897034 *Volume averaged electron temperature (keV)
te = 6 *Volume averaged electron temperature (keV)
tratio = 0.95 *Ion temperature / electron temperature
*zfear = 0 *High-Z impurity switch (0: Iron)

Expand Down
4 changes: 2 additions & 2 deletions tests/unit/test_power.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1928,7 +1928,7 @@ class AcpowParam(NamedTuple):
srcktpm=1071.1112934857531,
iprint=0,
outfile=11,
expected_pacpmw=1226.1273281650574,
expected_pacpmw=1164.244494532182,
),
AcpowParam(
efloor=381580.9594357388,
Expand All @@ -1949,7 +1949,7 @@ class AcpowParam(NamedTuple):
srcktpm=1069.8879533693198,
iprint=0,
outfile=11,
expected_pacpmw=651.53859031110437,
expected_pacpmw=589.3014463957436,
),
),
)
Expand Down