From c3641c9355760f6392baba567d8db205eca5db2b Mon Sep 17 00:00:00 2001 From: Clair Mould <86794332+clmould@users.noreply.github.com> Date: Mon, 1 Jul 2024 12:35:30 +0100 Subject: [PATCH 1/3] remove variables from pacpmw calculation which are already in fcsht calculation --- process/power.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/process/power.py b/process/power.py index 045c306683..5e0da7e1a0 100644 --- a/process/power.py +++ b/process/power.py @@ -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 From 738c9187651694b174f49606157c4ea78d8c1d7e Mon Sep 17 00:00:00 2001 From: Clair Mould <86794332+clmould@users.noreply.github.com> Date: Mon, 1 Jul 2024 15:25:50 +0100 Subject: [PATCH 2/3] update unit tests after changing formula for pacpmw calculation --- tests/unit/test_power.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 7105fc1082..0f237374da 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -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, @@ -1949,7 +1949,7 @@ class AcpowParam(NamedTuple): srcktpm=1069.8879533693198, iprint=0, outfile=11, - expected_pacpmw=651.53859031110437, + expected_pacpmw=589.3014463957436, ), ), ) From 31f8ee2e3a68c067752956c900310d6fa6690f1e Mon Sep 17 00:00:00 2001 From: Timothy Nunn Date: Tue, 2 Jul 2024 10:17:05 +0000 Subject: [PATCH 3/3] Update stellarator file to converge with new cost gradient --- tests/regression/input_files/stellarator.IN.DAT | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/regression/input_files/stellarator.IN.DAT b/tests/regression/input_files/stellarator.IN.DAT index d4b4874d09..aaf77a1387 100644 --- a/tests/regression/input_files/stellarator.IN.DAT +++ b/tests/regression/input_files/stellarator.IN.DAT @@ -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 @@ -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)