add gwf disu test

modflowpy · Nov 18, 2024 · 649a8ce · 649a8ce
1 parent 3f6b84c
commit 649a8ce
Show file tree

Hide file tree

Showing 41 changed files with 4,906 additions and 139 deletions.
diff --git a/flopy4/array.py b/flopy4/array.py
@@ -456,14 +456,18 @@ def load(cls, f, cwd, shape, header=True, **kwargs):
                     nlay = params.get("dimensions").get("nlay")
                     nrow = params.get("dimensions").get("nrow")
                     ncol = params.get("dimensions").get("ncol")
+                    shape = (nlay, nrow, ncol)
+                elif "disv" in mempath.split("/"):
+                    nlay = params.get("dimensions").get("nlay")
                     ncpl = params.get("dimensions").get("ncpl")
+                    shape = (nlay, ncpl)
+                elif "disu" in mempath.split("/"):
                     nodes = params.get("dimensions").get("nodes")
-                    if nrow and ncol:
-                        shape = (nlay, nrow, ncol)
-                    elif ncpl:
-                        shape = (nlay, ncpl)
-                    elif nodes:
+                    nja = params.get("dimensions").get("nja")
+                    if "nodes" in shape:
                         shape = nodes
+                    elif "nja" in shape:
+                        shape = nja
         if layered:
             nlay = shape[0]
             lshp = shape[1:]
@@ -554,7 +558,7 @@ def read_array(f, dtype):
             pos = f.tell()
             line = f.readline()
             line = line_strip(line)
-            if not re.match("^[0-9. ]+$", line):
+            if not re.match("^[-0-9. ]+$", line):
                 f.seek(pos, 0)
                 break
             astr.append(line)

diff --git a/flopy4/block.py b/flopy4/block.py
@@ -236,7 +236,7 @@ def load(cls, f, **kwargs):
             line = f.readline()
             if line == "":
                 raise ValueError("Early EOF, aborting")
-            if line == "\n":
+            if line == "\n" or line.lstrip().startswith("#"):
                 continue
             words = strip(line).lower().split()
             if period:

diff --git a/flopy4/compound.py b/flopy4/compound.py
@@ -374,7 +374,9 @@ def load(cls, f, **kwargs) -> "MFList":
         while True:
             pos = f.tell()
             line = f.readline()
-            if line.lower().startswith("end"):
+            if line == "\n" or line.lstrip().startswith("#"):
+                continue
+            elif line.lower().startswith("end"):
                 f.seek(pos)
                 break
             else: