Add choose psi norm value option to SH constraint (LCFS is still defa…

…ult), also remove clipping, not nessisary since fixes in Fusion-Power-Plant-Framework#3518
geograham · Oct 10, 2024 · 606eee6 · 606eee6
1 parent d330bcd
commit 606eee6
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 98 deletions.
diff --git a/bluemira/equilibria/optimisation/harmonics/__init__.py b/bluemira/equilibria/optimisation/harmonics/__init__.py
@@ -8,11 +8,11 @@
 from bluemira.equilibria.optimisation.harmonics.harmonics_approx_functions import (
     PointType,
     coil_harmonic_amplitude_matrix,
-    coils_outside_lcfs_sphere,
+    coils_outside_fs_sphere,
     collocation_points,
+    fs_fit_metric,
     get_psi_harmonic_amplitudes,
     harmonic_amplitude_marix,
-    lcfs_fit_metric,
     plot_psi_comparision,
     spherical_harmonic_approximation,
 )
@@ -28,11 +28,11 @@
     "SphericalHarmonicConstraint",
     "SphericalHarmonicConstraintFunction",
     "coil_harmonic_amplitude_matrix",
-    "coils_outside_lcfs_sphere",
+    "coils_outside_fs_sphere",
     "collocation_points",
+    "fs_fit_metric",
     "get_psi_harmonic_amplitudes",
     "harmonic_amplitude_marix",
-    "lcfs_fit_metric",
     "plot_psi_comparision",
     "spherical_harmonic_approximation",
 ]