format, lint, cleanup

Author: wpbonelli

docs/examples/quickstart.py

@@ -55,7 +55,5 @@
 ax.grid(which="both", color="white")
 head.plot.imshow(ax=ax)
 head.plot.contour(ax=ax, levels=[0.2, 0.4, 0.6, 0.8], linewidths=3.0)
-budget.plot.quiver(
-    x="x", y="y", u="npf-qx", v="npf-qy", ax=ax, color="white"
-)
+budget.plot.quiver(x="x", y="y", u="npf-qx", v="npf-qy", ax=ax, color="white")
 fig.savefig(ws / "quickstart.png")

flopy4/mf6/gwf/__init__.py

@@ -24,9 +24,7 @@ def convert_grid(value):
         return Dis.from_grid(value)
     if isinstance(value, Dis):
         return value
-    raise TypeError(
-        f"Expected Grid or Dis, got {type(value)}"
-    )
+    raise TypeError(f"Expected Grid or Dis, got {type(value)}")
 
 
 @xattree
@@ -58,7 +56,6 @@ def budget(self):
     output: Output = attrs.field(
         default=attrs.Factory(lambda self: Gwf.Output(self), takes_self=True)
     )
-    grid: Grid = attrs.field(default=None)
 
     @define
     class NewtonOptions:

flopy4/mf6/simulation.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-import attrs
+from flopy.discretization.modeltime import ModelTime
 from xattree import field, xattree
 
 from flopy4.mf6.component import Component
@@ -9,17 +9,14 @@
 from flopy4.mf6.solution import Solution
 from flopy4.mf6.tdis import Tdis
 
-from flopy.discretization.modeltime import ModelTime
-
 
 def convert_time(value):
     if isinstance(value, ModelTime):
         return Tdis.from_time(value)
     if isinstance(value, Tdis):
         return value
-    raise TypeError(
-        f"Expected ModelTime or Tdis, got {type(value)}"
-    )
+    raise TypeError(f"Expected ModelTime or Tdis, got {type(value)}")
+
 
 @xattree
 class Simulation(Component):
@@ -28,3 +25,7 @@ class Simulation(Component):
     solutions: dict[str, Solution] = field()
     sim_ws: Path = field(default=None)
     tdis: Tdis = field(converter=convert_time)
+
+    @property
+    def time(self) -> ModelTime:
+        return self.tdis.to_time()