misc cleanup

modflowpy · Nov 3, 2024 · b121237 · b121237
1 parent 83602f6
commit b121237
Show file tree

Hide file tree

Showing 13 changed files with 189 additions and 605 deletions.
diff --git a/flopy4/attrs.py b/flopy4/attrs.py
diff --git a/flopy4/io/lark.py b/flopy4/io/lark.py
diff --git a/flopy4/mf6/binary.py → flopy4/mf6/io/binary.py b/flopy4/mf6/binary.py → flopy4/mf6/io/binary.py
diff --git a/flopy4/mf6/io/converter.py b/flopy4/mf6/io/converter.py
diff --git a/flopy4/mf6/io/spec/__init__.py b/flopy4/mf6/io/spec/__init__.py
diff --git a/flopy4/mf6/io/spec/parser.py b/flopy4/mf6/io/spec/parser.py
diff --git a/flopy4/mf6/io/spec/transformer.py b/flopy4/mf6/io/spec/transformer.py
diff --git a/flopy4/mf6/io/transformer.py b/flopy4/mf6/io/transformer.py
@@ -3,13 +3,29 @@
 import numpy as np
 from lark import Transformer
 
-from flopy4.io.lark import (
-    parse_array,
-    parse_float,
-    parse_int,
-    parse_string,
-    parse_word,
-)
+
+def parse_word(_, w):
+    (w,) = w
+    return str(w)
+
+
+def parse_string(_, s):
+    return " ".join(s)
+
+
+def parse_int(_, i):
+    (i,) = i
+    return int(i)
+
+
+def parse_float(_, f):
+    (f,) = f
+    return float(f)
+
+
+def parse_array(_, a):
+    (a,) = a
+    return np.array(a)
 
 
 class MF6Transformer(Transformer):