|
8 | 8 | from flopy.mbase import ModelInterface |
9 | 9 | from flopy.pakbase import PackageInterface |
10 | 10 | from flopy.plot.plotutil import PlotUtilities |
| 11 | +from typing import Optional |
11 | 12 | from xattree import XatTree, _get_xatspec, _XatSpec |
12 | 13 |
|
13 | 14 | from flopy4.mf6.model import Model |
|
17 | 18 | class Flopy3Model(ModelInterface): |
18 | 19 | def __init__( |
19 | 20 | self, |
20 | | - model: Model = None, |
21 | | - modelgrid: Grid = None, |
22 | | - modeltime: ModelTime = None, |
23 | | - ims: Package = None, |
| 21 | + model: Optional[Model] = None, |
| 22 | + modelgrid: Optional[Grid] = None, |
| 23 | + modeltime: Optional[ModelTime] = None, |
| 24 | + ims: Optional[Package] = None, |
24 | 25 | ): |
25 | 26 | self._model = model |
26 | 27 | self._grid = modelgrid |
@@ -110,7 +111,7 @@ def solver_tols(self): |
110 | 111 | return None |
111 | 112 |
|
112 | 113 | @property |
113 | | - def export(self, f, **kwargs): |
| 114 | + def export(self, f): |
114 | 115 | pass |
115 | 116 |
|
116 | 117 | @property |
@@ -166,10 +167,10 @@ def plot(self, packages: list = None, **kwargs): |
166 | 167 | class Flopy3Package(PackageInterface): |
167 | 168 | def __init__( |
168 | 169 | self, |
169 | | - model: Flopy3Model = None, |
170 | | - data: XatTree = None, |
171 | | - spec: _XatSpec = None, |
172 | | - modeltime: ModelTime = None, |
| 170 | + model: Optional[Flopy3Model] = None, |
| 171 | + data: Optional[XatTree] = None, |
| 172 | + spec: Optional[_XatSpec] = None, |
| 173 | + modeltime: Optional[ModelTime] = None, |
173 | 174 | ): |
174 | 175 | self._model = model |
175 | 176 | self._data = data |
@@ -257,10 +258,10 @@ class Flopy3Data(DataInterface): |
257 | 258 | def __init__( |
258 | 259 | # TODO: types of data and spec are unions |
259 | 260 | self, |
260 | | - name: str = None, |
261 | | - modelname: str = None, |
262 | | - modelgrid: Grid = None, |
263 | | - modeltime: ModelTime = None, |
| 261 | + name: Optional[str] = None, |
| 262 | + modelname: Optional[str] = None, |
| 263 | + modelgrid: Optional[Grid] = None, |
| 264 | + modeltime: Optional[ModelTime] = None, |
264 | 265 | data=None, |
265 | 266 | spec=None, |
266 | 267 | ): |
|
0 commit comments