test: use flopy binary write routines, remove binary_util.py (#2758)

Use the new flopy binary write routines and remove the old binary_util.py

Author: wpbonelli

autotest/binary_util.py

@@ -8,7 +8,7 @@
 import flopy
 import numpy as np
 import pytest
-from binary_util import write_budget, write_head
+from flopy.utils.binaryfile import CellBudgetFile, HeadFile
 from flopy.utils.gridutil import uniform_flow_field
 from framework import TestFramework
 
@@ -109,9 +109,7 @@ def build_models(idx, name, test):
 
     # create a heads file with head equal top
     fname = os.path.join(ws, "myhead.hds")
-    with open(fname, "wb") as fbin:
-        for kstp in range(1):  # nstp[0]):
-            write_head(fbin, top * np.ones((nrow, ncol)), kstp=kstp + 1)
+    HeadFile.write(fname, {(1, 1): top * np.ones((nrow, ncol))}, precision="double")
 
     # create a budget file
     qx = 1.0
@@ -141,28 +139,30 @@ def build_models(idx, name, test):
     sat = np.array([(i, i, 0.0, 1.0) for i in range(nlay * nrow * ncol)], dtype=dt)
 
     fname = os.path.join(ws, "mybudget.bud")
-    with open(fname, "wb") as fbin:
-        for kstp in range(1):  # nstp[0]):
-            write_budget(fbin, flowja, kstp=kstp + 1)
-            write_budget(fbin, spdis, text="      DATA-SPDIS", imeth=6, kstp=kstp + 1)
-            write_budget(fbin, sat, text="        DATA-SAT", imeth=6, kstp=kstp + 1)
-            write_budget(
-                fbin,
-                wel,
-                text="             WEL",
-                imeth=6,
-                text2id2="           WEL-1",
-                kstp=kstp + 1,
-            )
-            write_budget(
-                fbin,
-                chd,
-                text="             CHD",
-                imeth=6,
-                text2id2="           CHD-1",
-                kstp=kstp + 1,
-            )
-    fbin.close()
+    budget_data = [
+        {"data": flowja, "text": "    FLOW-JA-FACE", "imeth": 1, "kstp": 1, "kper": 1},
+        {"data": spdis, "text": "      DATA-SPDIS", "imeth": 6, "kstp": 1, "kper": 1},
+        {"data": sat, "text": "        DATA-SAT", "imeth": 6, "kstp": 1, "kper": 1},
+        {
+            "data": wel,
+            "text": "             WEL",
+            "imeth": 6,
+            "paknam2": "           WEL-1",
+            "kstp": 1,
+            "kper": 1,
+        },
+        {
+            "data": chd,
+            "text": "             CHD",
+            "imeth": 6,
+            "paknam2": "           CHD-1",
+            "kstp": 1,
+            "kper": 1,
+        },
+    ]
+    CellBudgetFile.write(
+        fname, budget_data, nlay=nlay, nrow=nrow, ncol=ncol, precision="double"
+    )
 
     # flow model interface
     packagedata = [

autotest/test_gwt_adv01_fmi.py

@@ -3,7 +3,7 @@
 import flopy
 import numpy as np
 import pytest
-from binary_util import write_budget, write_head
+from flopy.utils.binaryfile import CellBudgetFile, HeadFile
 from framework import TestFramework
 
 cases = ["dsp01a_fmi", "dsp01b_fmi"]
@@ -120,9 +120,7 @@ def build_models(idx, test):
 
     # create a heads file with head equal top
     fname = os.path.join(ws, "myhead.hds")
-    with open(fname, "wb") as fbin:
-        for kstp in range(1):  # nstp[0]):
-            write_head(fbin, top * np.ones((nrow, ncol)), kstp=kstp + 1)
+    HeadFile.write(fname, {(1, 1): top * np.ones((nrow, ncol))}, precision="double")
 
     # create a budget file with flows set to zero
     nja = (ncol - 2) * 3 + 2 * 2
@@ -151,12 +149,14 @@ def build_models(idx, test):
     sat = np.array([(i, i, 0.0, 1.0) for i in range(nlay * nrow * ncol)], dtype=dt)
 
     fname = os.path.join(ws, "mybudget.bud")
-    with open(fname, "wb") as fbin:
-        for kstp in range(1):  # nstp[0]):
-            write_budget(fbin, flowja, kstp=kstp + 1)
-            write_budget(fbin, spdis, text="      DATA-SPDIS", imeth=6, kstp=kstp + 1)
-            write_budget(fbin, sat, text="        DATA-SAT", imeth=6, kstp=kstp + 1)
-    fbin.close()
+    budget_data = [
+        {"data": flowja, "text": "    FLOW-JA-FACE", "imeth": 1, "kstp": 1, "kper": 1},
+        {"data": spdis, "text": "      DATA-SPDIS", "imeth": 6, "kstp": 1, "kper": 1},
+        {"data": sat, "text": "        DATA-SAT", "imeth": 6, "kstp": 1, "kper": 1},
+    ]
+    CellBudgetFile.write(
+        fname, budget_data, nlay=nlay, nrow=nrow, ncol=ncol, precision="double"
+    )
 
     # flow model interface
     packagedata = [

autotest/test_gwt_dsp01_fmi.py

@@ -3,7 +3,7 @@
 import flopy
 import numpy as np
 import pytest
-from binary_util import write_budget, write_head
+from flopy.utils.binaryfile import CellBudgetFile, HeadFile
 from flopy.utils.gridutil import uniform_flow_field
 from framework import TestFramework
 
@@ -109,9 +109,7 @@ def build_models(idx, test):
 
     # create a heads file with head equal top
     fname = os.path.join(ws, "myhead.hds")
-    with open(fname, "wb") as fbin:
-        for kstp in range(nstp[0]):
-            write_head(fbin, top * np.ones((nrow, ncol)), kstp=kstp + 1)
+    HeadFile.write(fname, {(1, 1): top * np.ones((nrow, ncol))}, precision="double")
 
     # create a budget file
     qx = 0.0
@@ -143,12 +141,14 @@ def build_models(idx, test):
     sat = np.array([(i, i, 0.0, 1.0) for i in range(nlay * nrow * ncol)], dtype=dt)
 
     fname = os.path.join(ws, "mybudget.bud")
-    with open(fname, "wb") as fbin:
-        for kstp in range(nstp[0]):
-            write_budget(fbin, flowja, kstp=kstp + 1)
-            write_budget(fbin, spdis, text="      DATA-SPDIS", imeth=6, kstp=kstp + 1)
-            write_budget(fbin, sat, text="        DATA-SAT", imeth=6, kstp=kstp + 1)
-    fbin.close()
+    budget_data = [
+        {"data": flowja, "text": "    FLOW-JA-FACE", "imeth": 1, "kstp": 1, "kper": 1},
+        {"data": spdis, "text": "      DATA-SPDIS", "imeth": 6, "kstp": 1, "kper": 1},
+        {"data": sat, "text": "        DATA-SAT", "imeth": 6, "kstp": 1, "kper": 1},
+    ]
+    CellBudgetFile.write(
+        fname, budget_data, nlay=nlay, nrow=nrow, ncol=ncol, precision="double"
+    )
 
     # flow model interface
     packagedata = [