Skip to content

Correct freegs4e module imports to allow editable install #40

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
georgeholt1 merged 2 commits into from
Oct 8, 2025
Merged

Correct freegs4e module imports to allow editable install #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d918009
Correct freegs4e module imports to allow editable install
timothy-nunn Sep 12, 2025
26d68a4
Merge branch 'main' into allow-freegs4e-editable
kpentland Oct 6, 2025
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
8 changes: 4 additions & 4 deletions freegsnke/equilibrium_update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the FreeGSNKE equilibrium Object, which inherits from the FreeGS4E equilibrium object.
Defines the FreeGSNKE equilibrium Object, which inherits from the FreeGS4E equilibrium object.

Copyright 2025 UKAEA, UKRI-STFC, and The Authors, as per the COPYRIGHT and README files.

Expand All @@ -14,15 +14,15 @@
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

You should have received a copy of the GNU Lesser General Public License
along with FreeGSNKE. If not, see <http://www.gnu.org/licenses/>.
along with FreeGSNKE. If not, see <http://www.gnu.org/licenses/>.
"""

import os
import pickle

import freegs4e
import freegs4e.equilibrium
import numpy as np
from freegs4e import critical
from scipy import interpolate
Expand Down
10 changes: 4 additions & 6 deletions freegsnke/jtor_update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Defines the FreeGSNKE profile Object, which inherits from the FreeGS4E profile object.
Defines the FreeGSNKE profile Object, which inherits from the FreeGS4E profile object.

Copyright 2025 UKAEA, UKRI-STFC, and The Authors, as per the COPYRIGHT and README files.

Expand All @@ -14,12 +14,12 @@
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

You should have received a copy of the GNU Lesser General Public License
along with FreeGSNKE. If not, see <http://www.gnu.org/licenses/>.
along with FreeGSNKE. If not, see <http://www.gnu.org/licenses/>.
"""

import freegs4e
import freegs4e.jtor
import numpy as np
from freegs4e.gradshafranov import mu0
from matplotlib.path import Path
Expand All @@ -31,7 +31,6 @@


class Jtor_universal:

def __init__(self, refine_jtor=False):
"""Sets default unrefined Jtor."""
if refine_jtor:
Expand Down Expand Up @@ -278,7 +277,6 @@ def diverted_critical_complete(
rel_tolerance_xpt=1e-4,
starting_dx=0.05,
):

try:
opt, xpt, diverted_core_mask, psi_bndry = self.Jtor_part1(
R, Z, psi, psi_bndry, mask_outside_limiter
Expand Down