xattree update

Author: mjreno

flopy4/mf6/interface/flopy3.py

@@ -10,7 +10,7 @@
 from flopy.mbase import ModelInterface
 from flopy.pakbase import PackageInterface
 from flopy.plot.plotutil import PlotUtilities
-from xattree import _get_xatspec, _Xattribute
+from xattree import Xattribute, _get_xatspec
 
 from flopy4.mf6.model import Model
 from flopy4.mf6.package import Package
@@ -197,6 +197,7 @@ def __init__(
         for a in self._data.attrs:
             if (
                 self._data.attrs[a] is not None
+                and a in self._spec.flat
                 and self._spec.flat[a].type is not None
             ):
                 d_fp3 = Flopy3Data(
@@ -211,7 +212,11 @@ def __init__(
                 self._dlist.append(d_fp3)
 
         for v in self._data.data_vars:
-            if self._data.data_vars[v] is not None:
+            if (
+                self._data.data_vars[v] is not None
+                and v in self._spec.flat
+                and self._spec.flat[v].type is not None
+            ):
                 d_fp3 = Flopy3Data(
                     data=self._data.data_vars[v],
                     spec=self._spec.flat[v],
@@ -276,7 +281,7 @@ class Flopy3Data(DataInterface):
     def __init__(
         self,
         data,
-        spec: _Xattribute,
+        spec: Xattribute,
         name: Optional[str] = None,
         modelname: Optional[str] = None,
         modelgrid: Optional[Grid] = None,