Merge pull request #1015 from ToFuProject/Issue1014_EQDSK

Better eqdsk loading
ToFuProject · Jan 24, 2025 · cbbb139 · cbbb139
2 parents 9c06d1d + 697bfcd
commit cbbb139
Show file tree

Hide file tree

Showing 4 changed files with 780 additions and 229 deletions.
diff --git a/tofu/data/_class01_Plasma2D.py b/tofu/data/_class01_Plasma2D.py
@@ -67,30 +67,32 @@ def load_equilirium_from_eqdsk(
         self,
         dpfe=None,
         returnas=None,
-        strict=None,
         # keys
         kmesh=None,
-        # optional time
-        t=None,
-        ktime=None,
-        knt=None,
-        t_units=None,
+        # group naming
+        func_key_groups=None,
+        # sorting
+        sort_vs=None,
+        # options
+        verb=None,
+        strict=None,
     ):
         """ Load an equilibriu map from an eqdsk file
 
         Load the R, Z mesh and corresponding psi 2d map
         """
         return _eqdsk.load_eqdsk(
             dpfe=dpfe,
-            returnas=self,
-            strict=strict,
+            returnas=returnas,
             # keys
             kmesh=kmesh,
-            # optional time
-            t=t,
-            ktime=ktime,
-            knt=knt,
-            t_units=t_units,
+            # group naming
+            func_key_groups=func_key_groups,
+            # sorting
+            sort_vs=sort_vs,
+            # options
+            verb=verb,
+            strict=strict,
         )
 
     # -------------------