diff --git a/bluemira/magnets/__init__.py b/bluemira/magnets/__init__.py index 07c8df8f00..de7dd20f43 100644 --- a/bluemira/magnets/__init__.py +++ b/bluemira/magnets/__init__.py @@ -1,23 +1,8 @@ -# bluemira is an integrated inter-disciplinary design tool for future fusion -# reactors. It incorporates several modules, some of which rely on other -# codes, to carry out a range of typical conceptual fusion reactor design -# activities. +# SPDX-FileCopyrightText: 2021-present M. Coleman, J. Cook, F. Franza +# SPDX-FileCopyrightText: 2021-present I.A. Maione, S. McIntosh +# SPDX-FileCopyrightText: 2021-present J. Morris, D. Short # -# Copyright (C) 2021-2023 M. Coleman, J. Cook, F. Franza, I.A. Maione, S. McIntosh, -# J. Morris, D. Short -# -# bluemira is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# bluemira is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with bluemira; if not, see . +# SPDX-License-Identifier: LGPL-2.1-or-later """ Magnets module for the bluemira code. diff --git a/bluemira/magnets/solenoid_tools.py b/bluemira/magnets/solenoid_tools.py index 563c208081..dca450b4eb 100644 --- a/bluemira/magnets/solenoid_tools.py +++ b/bluemira/magnets/solenoid_tools.py @@ -1,23 +1,8 @@ -# bluemira is an integrated inter-disciplinary design tool for future fusion -# reactors. It incorporates several modules, some of which rely on other -# codes, to carry out a range of typical conceptual fusion reactor design -# activities. +# SPDX-FileCopyrightText: 2021-present M. Coleman, J. Cook, F. Franza +# SPDX-FileCopyrightText: 2021-present I.A. Maione, S. McIntosh +# SPDX-FileCopyrightText: 2021-present J. Morris, D. Short # -# Copyright (C) 2021-2023 M. Coleman, J. Cook, F. Franza, I.A. Maione, S. McIntosh, -# J. Morris, D. Short -# -# bluemira is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# bluemira is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with bluemira; if not, see . +# SPDX-License-Identifier: LGPL-2.1-or-later """ Tools for simple solenoid calculations. diff --git a/examples/magnets/central_solenoid_example.ex.py b/examples/magnets/central_solenoid_example.ex.py index 57605c8726..51c3318d4c 100644 --- a/examples/magnets/central_solenoid_example.ex.py +++ b/examples/magnets/central_solenoid_example.ex.py @@ -14,26 +14,11 @@ # --- # %% tags=["remove-cell"] -# bluemira is an integrated inter-disciplinary design tool for future fusion -# reactors. It incorporates several modules, some of which rely on other -# codes, to carry out a range of typical conceptual fusion reactor design -# activities. +# SPDX-FileCopyrightText: 2021-present M. Coleman, J. Cook, F. Franza +# SPDX-FileCopyrightText: 2021-present I.A. Maione, S. McIntosh +# SPDX-FileCopyrightText: 2021-present J. Morris, D. Short # -# Copyright (C) 2021-2023 M. Coleman, J. Cook, F. Franza, I.A. Maione, S. McIntosh, -# J. Morris, D. Short -# -# bluemira is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# bluemira is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with bluemira; if not, see . +# SPDX-License-Identifier: LGPL-2.1-or-later """ An example central solenoid winding pack design diff --git a/tests/magnets/__init__.py b/tests/magnets/__init__.py index 0c5e05f2ed..a42e2bcb16 100644 --- a/tests/magnets/__init__.py +++ b/tests/magnets/__init__.py @@ -1,20 +1,5 @@ -# bluemira is an integrated inter-disciplinary design tool for future fusion -# reactors. It incorporates several modules, some of which rely on other -# codes, to carry out a range of typical conceptual fusion reactor design -# activities. +# SPDX-FileCopyrightText: 2021-present M. Coleman, J. Cook, F. Franza +# SPDX-FileCopyrightText: 2021-present I.A. Maione, S. McIntosh +# SPDX-FileCopyrightText: 2021-present J. Morris, D. Short # -# Copyright (C) 2021-2023 M. Coleman, J. Cook, F. Franza, I.A. Maione, S. McIntosh, -# J. Morris, D. Short -# -# bluemira is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# bluemira is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with bluemira; if not, see . +# SPDX-License-Identifier: LGPL-2.1-or-later diff --git a/tests/magnets/test_solenoid_tools.py b/tests/magnets/test_solenoid_tools.py index 3d2ae09b63..e6a7e955ab 100644 --- a/tests/magnets/test_solenoid_tools.py +++ b/tests/magnets/test_solenoid_tools.py @@ -1,24 +1,8 @@ -# bluemira is an integrated inter-disciplinary design tool for future fusion -# reactors. It incorporates several modules, some of which rely on other -# codes, to carry out a range of typical conceptual fusion reactor design -# activities. +# SPDX-FileCopyrightText: 2021-present M. Coleman, J. Cook, F. Franza +# SPDX-FileCopyrightText: 2021-present I.A. Maione, S. McIntosh +# SPDX-FileCopyrightText: 2021-present J. Morris, D. Short # -# Copyright (C) 2021-2023 M. Coleman, J. Cook, F. Franza, I.A. Maione, S. McIntosh, -# J. Morris, D. Short -# -# bluemira is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# bluemira is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with bluemira; if not, see . - +# SPDX-License-Identifier: LGPL-2.1-or-later import numpy as np import pytest @@ -54,8 +38,8 @@ def test_radial_boundary_conditions(self): class TestCalculateBmax: @pytest.mark.parametrize( - "alpha,beta,k_expected", - [[1.375, 1.2, 1.12], [1.322, 1.5, 1.07], [1.287, 2.0, 1.03]], + ("alpha", "beta", "k_expected"), + [(1.375, 1.2, 1.12), (1.322, 1.5, 1.07), (1.287, 2.0, 1.03)], ) def test_Bmax(self, alpha, beta, k_expected): """