some mypy fixes

Author: mjreno

flopy4/mf6/interface/flopy3.py

@@ -18,7 +18,7 @@
 class Flopy3Model(ModelInterface):
     def __init__(
         self,
-        model: Optional[Model] = None,
+        model: Model,
         modelgrid: Optional[Grid] = None,
         modeltime: Optional[ModelTime] = None,
         ims: Optional[Package] = None,
@@ -103,13 +103,12 @@ def solver_tols(self):
         """
         Solver inner hclose and rclose values.
         """
-        if self._ims:
-            return self._ims.inner_hclose, self._ims.inner_rclose
+        assert self._ims
+        return self._ims.inner_hclose, self._ims.inner_rclose
 
         return None
 
-    @property
-    def export(self, f):
+    def export(self, f, **kwargs):
         pass
 
     @property
@@ -154,6 +153,8 @@ def get_package_list(self, ftype=None):
         return [p.name for p in self._plist]
 
     def plot(self, packages: list = None, **kwargs):
+        if packages is None:
+            packages = self.get_package_list()
         return PlotUtilities._plot_model_helper(
             self, SelPackList=packages, **kwargs
         )
@@ -164,11 +165,21 @@ def __init__(
         self,
         package: Package,
         model: Optional[Flopy3Model] = None,
+        modelgrid: Optional[Grid] = None,
         modeltime: Optional[ModelTime] = None,
     ):
         self._model = model
-        self._data = package.data
+        if hasattr(package, "data"):
+            self._data = package.data
+        else:
+            raise Exception("Input package has no data")
         self._spec = _get_xatspec(type(package))
+        if modelgrid:
+            self._grid = modelgrid
+        elif model:
+            self._grid = model.modelgrid
+        else:
+            raise Exception("Input package needs grid")
         self._time = modeltime
         self._dlist = list()
 
@@ -177,7 +188,7 @@ def __init__(
                 d_fp3 = Flopy3Data(
                     name=a,
                     modelname=self.parent,
-                    modelgrid=model.modelgrid,
+                    modelgrid=self._grid,
                     modeltime=modeltime,
                     data=self._data.attrs[a],
                     spec=self._spec.flat[a],
@@ -189,7 +200,7 @@ def __init__(
             d_fp3 = Flopy3Data(
                 name=v,
                 modelname=self.parent,
-                modelgrid=model.modelgrid,
+                modelgrid=self._grid,
                 modeltime=modeltime,
                 data=self._data.data_vars[v],
                 spec=self._spec.flat[v],

test/test_interface.py

@@ -93,7 +93,7 @@ def test_modelif():
 
 
 def norun_test_cbd_small():
-    # def test_cbd_small():
+#def test_cbd_small():
     import sys
 
     sys.path.append("/home/mjreno/.clone/usgs/flopy/autotest")