Skip to content
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.

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

[#1017] Unifying interface for loading equilibria from EQDSK and MEQ,… #1018

Merged
merged 7 commits into from
Jan 27, 2025

Conversation

Didou09
Copy link
Member

@Didou09 Didou09 commented Jan 27, 2025

Main changes:

  • load_equilibrium_from_files() now more generic:

    • handles:
      • .eqdsk files with _class01_load_from_eqdsk.py
      • MEQ .mat files with _class01_load_from_meq.py
    • Handles sort_vs using original attribute names or standardized keys indifferentiatlly
    • explore=bool implemented to print content of loaded files
    • Both EQDSK and MEQ files load poloidal flux map, separatrix, magnetic axis + B-field components for MEQ + all available scalars (Ip, Volume, etc...)
    • rhopn is derived from psi using add_ropn=True
  • tofu/data/_utils_types.py now provides _DTYPES for types

Issues:

Fixes, in devel, issue #1017

@pep8speaks
Copy link

pep8speaks commented Jan 27, 2025

Hello @Didou09! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

Line 426:9: E731 do not assign a lambda expression, use a def
Line 914:33: E225 missing whitespace around operator

Line 253:1: E303 too many blank lines (5)
Line 295:22: W292 no newline at end of file
Line 295:22: W292 no newline at end of file
Line 295:22: W292 no newline at end of file

Line 10:1: E303 too many blank lines (3)
Line 203:5: E303 too many blank lines (2)
Line 242:17: W292 no newline at end of file

Line 21:54: W292 no newline at end of file

Comment last updated at 2025-01-27 18:54:54 UTC

@Didou09 Didou09 merged commit 2c2771f into devel Jan 27, 2025
14 checks passed
@Didou09 Didou09 deleted the Issue1017_MEQ branch January 27, 2025 19:25
@Didou09 Didou09 mentioned this pull request Feb 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants