Skip to content

Remove globals from plot proc and some cleanup #4031

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
je-cook merged 6 commits into from
Jan 5, 2026
Merged

Remove globals from plot proc and some cleanup #4031

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6cd7dfc
first pass
je-cook Dec 19, 2025
3f787ac
radial build
je-cook Jan 5, 2026
44510c5
use get method in get_variables
je-cook Jan 5, 2026
f616e72
scan as kwarg
je-cook Jan 5, 2026
a3c52c9
scan actually as kwarg
je-cook Jan 5, 2026
0b3b981
set scan default to -1
je-cook Jan 5, 2026
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
2 changes: 1 addition & 1 deletion process/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1532,7 +1532,7 @@ def plasma_outboard_edge_toroidal_ripple(
i_tf_sup: int,
dx_tf_wp_insulation: float,
dx_tf_wp_insertion_gap: float,
) -> float:
) -> tuple[float, float, int]:
"""
Plasma outboard toroidal field (TF) ripple calculation.

Expand Down
7 changes: 7 additions & 0 deletions process/io/mfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import json
import logging
from collections import OrderedDict
from typing import Any

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -208,6 +209,12 @@ def __init__(self, filename="MFILE.DAT"):
self.open_mfile()
self.parse_mfile()

def get_variables(self, *variables: str, scan: int) -> list[Any]:
return [self.data[v].get_scan(scan) for v in variables]

def get(self, variable: str, scan: int) -> Any:
return self.data[variable].get_scan(scan)

def open_mfile(self):
"""Function to open MFILE.DAT"""
with open(self.filename, encoding="utf-8") as mfile:
Expand Down
Loading