From ec471a73a1ea47fe0687b6128a283bc82286d66e Mon Sep 17 00:00:00 2001 From: Bharat Medasani Date: Tue, 31 Oct 2023 10:23:28 -0400 Subject: [PATCH] Fixes for linter issue of unused variables --- src/simsopt/geo/qfmsurface.py | 2 +- src/simsopt/geo/surfacehenneberg.py | 2 +- src/simsopt/util/permanent_magnet_helper_functions.py | 8 ++++---- tests/mhd/test_boozer.py | 6 ++---- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/simsopt/geo/qfmsurface.py b/src/simsopt/geo/qfmsurface.py index 9bcb5f102..67cd3ad63 100644 --- a/src/simsopt/geo/qfmsurface.py +++ b/src/simsopt/geo/qfmsurface.py @@ -1,4 +1,4 @@ -from scipy.optimize import minimize, NonlinearConstraint +from scipy.optimize import minimize # , NonlinearConstraint from .._core.json import GSONable from .surfaceobjectives import QfmResidual diff --git a/src/simsopt/geo/surfacehenneberg.py b/src/simsopt/geo/surfacehenneberg.py index 6778c57ec..69626c9d4 100644 --- a/src/simsopt/geo/surfacehenneberg.py +++ b/src/simsopt/geo/surfacehenneberg.py @@ -682,7 +682,7 @@ def gammadash1_impl(self, data): rho += self.get_rhomn(m, n) * cosangle d_rho_d_phi -= self.get_rhomn(m, n) * sinangle * (nfp * n - alpha) R0H2D = np.kron(R0H, np.ones((ntheta, 1))) - Z0H2D = np.kron(Z0H, np.ones((ntheta, 1))) + # Z0H2D = np.kron(Z0H, np.ones((ntheta, 1))) b2D = np.kron(b, np.ones((ntheta, 1))) zeta = b2D * np.sin(theta - alpha * phi) d_R0H2D_d_phi = np.kron(d_R0H_d_phi, np.ones((ntheta, 1))) diff --git a/src/simsopt/util/permanent_magnet_helper_functions.py b/src/simsopt/util/permanent_magnet_helper_functions.py index fb738512b..05681280a 100644 --- a/src/simsopt/util/permanent_magnet_helper_functions.py +++ b/src/simsopt/util/permanent_magnet_helper_functions.py @@ -490,7 +490,7 @@ def run_Poincare_plots(s_plot, bs, b_dipole, comm, filename_poincare, out_dir='' out_dir: Path or string for the output directory for saved files. """ from simsopt.field.magneticfieldclasses import InterpolatedField - from simsopt.objectives import SquaredFlux + # from simsopt.objectives import SquaredFlux out_dir = Path(out_dir) @@ -502,11 +502,11 @@ def run_Poincare_plots(s_plot, bs, b_dipole, comm, filename_poincare, out_dir='' phirange = (0, 2 * np.pi / s_plot.nfp, n * 2) zrange = (0, np.max(zs), n // 2) degree = 4 # 2 is sufficient sometimes - nphi = len(s_plot.quadpoints_phi) - ntheta = len(s_plot.quadpoints_theta) + # nphi = len(s_plot.quadpoints_phi) + # ntheta = len(s_plot.quadpoints_theta) bs.set_points(s_plot.gamma().reshape((-1, 3))) b_dipole.set_points(s_plot.gamma().reshape((-1, 3))) - Bnormal = np.sum(bs.B().reshape((nphi, ntheta, 3)) * s_plot.unitnormal(), axis=2) + # Bnormal = np.sum(bs.B().reshape((nphi, ntheta, 3)) * s_plot.unitnormal(), axis=2) # Bnormal_dipole = np.sum(b_dipole.B().reshape((nphi, ntheta, 3)) * s_plot.unitnormal(), axis=2) # f_B = SquaredFlux(s_plot, b_dipole, -Bnormal).J() make_Bnormal_plots(bs, s_plot, out_dir, "biot_savart_pre_poincare_check") diff --git a/tests/mhd/test_boozer.py b/tests/mhd/test_boozer.py index 0ca858a25..840cab57a 100755 --- a/tests/mhd/test_boozer.py +++ b/tests/mhd/test_boozer.py @@ -184,9 +184,8 @@ def test_boozer_circular_tokamak(self): # registered surface: # Register a QP target at s = 1: s = 0.9999 - qs4 = Quasisymmetry(b, s, 0, 1) + Quasisymmetry(b, s, 0, 1) self.assertEqual(b.s, {0.5, s, 1.0}) - # residuals4 = qs4.J() np.testing.assert_allclose(b.bx.compute_surfs, [7, 15]) self.assertEqual(b.s_to_index, {0.5: 0, 1.0: 1, s: 1}) @@ -206,8 +205,7 @@ def test_boozer_circular_tokamak(self): def test_boozer_li383(self): v = Vmec(os.path.join(TEST_DIR, "wout_li383_low_res_reference.nc")) b = Boozer(v, mpol=32, ntor=16) - qs1 = Quasisymmetry(b, [0.0, 1.0], 1, 0) - # residuals = qs1.J() + Quasisymmetry(b, [0.0, 1.0], 1, 0) np.testing.assert_allclose(b.bx.compute_surfs, [0, 14]) self.assertEqual(b.s_to_index, {0.0: 0, 1.0: 1}) bmnc = b.bx.bmnc_b