merge updates

Author: mjreno

docs/examples/quickstart.py

@@ -45,7 +45,7 @@
 
 assert chd.data["head"][0, 0] == 1.0
 assert chd.data.head.sel(per=0)[99] == 0.0
-assert np.allclose(chd.data.head[:, 1:99], np.full(98, 1e30))
+assert np.allclose(chd.data.head[:, 1:99], np.full(98, 3e30))
 
 assert gwf.dis.data.botm.sel(lay=0, col=0, row=0) == 0.0
 

flopy4/mf6/converter/unstructure.py

@@ -11,6 +11,7 @@
 
 from flopy4.mf6.binding import Binding
 from flopy4.mf6.component import Component
+from flopy4.mf6.constants import FILL_DNODATA
 from flopy4.mf6.context import Context
 from flopy4.mf6.spec import FileInOut
 
@@ -228,8 +229,6 @@ def _unstructure_layer_component(value: Component) -> dict[str, Any]:
 
 
 def _unstructure_grid_component(value: Component) -> dict[str, Any]:
-    from flopy4.mf6.constants import FILL_DNODATA
-
     blockspec = dict(sorted(value.dfn.blocks.items(), key=block_sort_key))  # type: ignore
     blocks: dict[str, dict[str, Any]] = {}
     xatspec = xattree.get_xatspec(type(value))

test/test_mf6_codec.py

@@ -2,8 +2,8 @@
 
 from pprint import pprint
 
-import pytest
 import numpy as np
+import pytest
 
 from flopy4.mf6.codec import dumps, loads
 from flopy4.mf6.constants import FILL_DNODATA
@@ -251,8 +251,8 @@ def test_dumps_chd():
     assert len(lines) == 2
     assert "1 1 1 10.0" in dumped  # First CHD cell - node 1
     assert "1 10 10 20.0" in dumped  # Second CHD cell - node 100
-    assert "1e+30" not in dumped
-    assert "1.0e+30" not in dumped
+    assert "3e+30" not in dumped
+    assert "3.0e+30" not in dumped
 
     loaded = loads(dumped)
     print("CHD load:")
@@ -336,8 +336,8 @@ def test_dumps_wel():
     assert "1 3 4 -100.0" in dumped  # (0,2,3) -> node 24
     assert "2 6 8 -50.0" in dumped  # (1,5,7) -> node 158
     assert "3 9 2 25.0" in dumped  # (2,8,1) -> node 282
-    assert "1e+30" not in dumped
-    assert "1.0e+30" not in dumped
+    assert "3e+30" not in dumped
+    assert "3.0e+30" not in dumped
 
     loaded = loads(dumped)
     print("WEL load:")
@@ -401,8 +401,8 @@ def test_dumps_drn():
     assert "1 2 2 12.0 1.5" in dumped  # Period 2: (0,1,1)
     assert "1 3 4 9.0 0.8" in dumped  # Period 2: (0,2,3)
     assert "2 4 3 7.0 2.2" in dumped  # Period 2: (1,3,2)
-    assert "1e+30" not in dumped
-    assert "1.0e+30" not in dumped
+    assert "3e+30" not in dumped
+    assert "3.0e+30" not in dumped
 
     loaded = loads(dumped)
     print("DRN load:")
@@ -414,9 +414,9 @@ def test_dumps_npf():
 
     dis = Dis(nlay=2, nrow=5, ncol=5)
     gwf = Gwf(dis=dis)
-    drn = Npf(parent=gwf, cvoptions=Npf.CvOptions(dewatered=True), k=1.0)
+    npf = Npf(parent=gwf, cvoptions=Npf.CvOptions(dewatered=True), k=1.0)
 
-    dumped = dumps(COMPONENT_CONVERTER.unstructure(drn))
+    dumped = dumps(COMPONENT_CONVERTER.unstructure(npf))
     print("NPF dump:")
     print(dumped)
 
@@ -452,8 +452,8 @@ def test_dumps_chd_2():
     assert "100.0" in dumped  # Left boundary
     assert "95.0" in dumped  # Right boundary
     assert "98.0" in dumped  # Bottom boundary
-    assert "1e+30" not in dumped
-    assert "1.0e+30" not in dumped
+    assert "3e+30" not in dumped
+    assert "3.0e+30" not in dumped
 
     loaded = loads(dumped)
     print("CHD load:")
@@ -495,8 +495,8 @@ def test_dumps_wel_with_aux():
     # node q aux_value
     assert "1 2 3 -75.0 1.0" in dumped  # (0,1,2) -> node 8, q=-75.0, aux=1.0
     assert "2 4 5 -25.0 2.0" in dumped  # (1,3,4) -> node 45, q=-25.0, aux=2.0
-    assert "1e+30" not in dumped
-    assert "1.0e+30" not in dumped
+    assert "3e+30" not in dumped
+    assert "3.0e+30" not in dumped
 
     loaded = loads(dumped)
     print("WEL+aux load:")