Skip to content

Fixing multiple typos in squareness calculation #48

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

Fixing multiple typos in squareness calculation #48

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
056af20
fixing multiple typos in squareness calculation
Oct 8, 2025
f62ceac
Merge branch 'main' into squareness_fix
kpentland Oct 8, 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
24 changes: 12 additions & 12 deletions freegs4e/equilibrium.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1523,9 +1523,9 @@ def squareness(self):
ui_ellipse = sh.Polygon(
ellipse_points(
R0=self._sep_RZmax,
Z0=self._sep_ZRmax,
Z0=self._sep_ZRmin,
A=self._sep_RZmax - self._sep_Rmin,
B=self._sep_Zmax - self._sep_ZRmax,
B=self._sep_Zmax - self._sep_ZRmin,
)
)
lo_ellipse = sh.Polygon(
Expand All @@ -1539,9 +1539,9 @@ def squareness(self):
li_ellipse = sh.Polygon(
ellipse_points(
R0=self._sep_RZmin,
Z0=self._sep_ZRmax,
Z0=self._sep_ZRmin,
A=self._sep_RZmin - self._sep_Rmin,
B=self._sep_ZRmax - self._sep_Zmin,
B=self._sep_ZRmin - self._sep_Zmin,
)
)

Expand All @@ -1554,7 +1554,7 @@ def squareness(self):
)
ui_diag = sh.LineString(
[
[self._sep_RZmax, self._sep_ZRmax],
[self._sep_RZmax, self._sep_ZRmin],
[self._sep_Rmin, self._sep_Zmax],
]
)
Expand All @@ -1566,21 +1566,21 @@ def squareness(self):
)
li_diag = sh.LineString(
[
[self._sep_RZmin, self._sep_ZRmax],
[self._sep_RZmin, self._sep_ZRmin],
[self._sep_Rmin, self._sep_Zmin],
]
)

# find intersecting line lengths
uo_diag_core = uo_diag.intersection(plasma_boundary).length
ui_diag_core = uo_diag.intersection(plasma_boundary).length
lo_diag_core = uo_diag.intersection(plasma_boundary).length
li_diag_core = uo_diag.intersection(plasma_boundary).length
ui_diag_core = ui_diag.intersection(plasma_boundary).length
lo_diag_core = lo_diag.intersection(plasma_boundary).length
li_diag_core = li_diag.intersection(plasma_boundary).length

uo_diag_ellipse = uo_diag.intersection(uo_ellipse).length
ui_diag_ellipse = uo_diag.intersection(ui_ellipse).length
lo_diag_ellipse = uo_diag.intersection(lo_ellipse).length
li_diag_ellipse = uo_diag.intersection(li_ellipse).length
ui_diag_ellipse = ui_diag.intersection(ui_ellipse).length
lo_diag_ellipse = lo_diag.intersection(lo_ellipse).length
li_diag_ellipse = li_diag.intersection(li_ellipse).length

# calculate squarenesses
s_uo = (uo_diag_core - uo_diag_ellipse) / (
Expand Down