fix maxbound

Author: wpbonelli

flopy4/mf6/converter.py

@@ -2,10 +2,13 @@
 from pathlib import Path
 from typing import Any
 
+import numpy as np
+import xarray as xr
 import xattree
 from cattrs import Converter
 
 from flopy4.mf6.component import Component
+from flopy4.mf6.constants import FILL_DNODATA
 from flopy4.mf6.spec import get_blocks
 
 

flopy4/mf6/filters.py

@@ -66,8 +66,10 @@ def field_type(value: Any) -> str:
     """
     if isinstance(value, bool):
         return "keyword"
-    if isinstance(value, (int, float)):
-        return "scalar"
+    if isinstance(value, int):
+        return "integer"
+    if isinstance(value, float):
+        return "double precision"
     if isinstance(value, str):
         return "string"
     if isinstance(value, (dict, tuple)):

flopy4/mf6/gwf/chd.py

@@ -2,7 +2,7 @@
 from typing import ClassVar, Optional
 
 import numpy as np
-from attrs import Converter
+from attrs import Converter, setters
 from numpy.typing import NDArray
 from xattree import xattree
 
@@ -12,6 +12,43 @@
 from flopy4.mf6.spec import array, field
 
 
+def _update_maxbound(instance, attribute, new_value):
+    """Update maxbound when period block arrays change."""
+    if hasattr(instance, '_updating_maxbound'):
+        return new_value
+    
+    # Calculate maxbound from all relevant arrays
+    maxbound_values = []
+    
+    # Check head array
+    head_val = new_value if attribute and attribute.name == 'head' else getattr(instance, 'head', None)
+    if head_val is not None:
+        head = head_val if head_val.data.shape == head_val.shape else head_val.todense()
+        maxbound_values.append(len(np.where(head != FILL_DNODATA)[0]))
+    
+    # Check aux array  
+    aux_val = new_value if attribute and attribute.name == 'aux' else getattr(instance, 'aux', None)
+    if aux_val is not None:
+        aux = aux_val if aux_val.data.shape == aux_val.shape else aux_val.todense()
+        maxbound_values.append(len(np.where(aux != FILL_DNODATA)[0]))
+    
+    # Check boundname array
+    boundname_val = new_value if attribute and attribute.name == 'boundname' else getattr(instance, 'boundname', None)
+    if boundname_val is not None:
+        boundname = boundname_val if boundname_val.data.shape == boundname_val.shape else boundname_val.todense()
+        maxbound_values.append(len(np.where(boundname != "")[0]))
+    
+    # Update maxbound if we have values
+    if maxbound_values:
+        instance._updating_maxbound = True
+        try:
+            instance.maxbound = max(maxbound_values)
+        finally:
+            delattr(instance, '_updating_maxbound')
+    
+    return new_value
+
+
 @xattree
 class Chd(Package):
     multi_package: ClassVar[bool] = True
@@ -34,6 +71,7 @@ class Chd(Package):
         default=None,
         converter=Converter(dict_to_array, takes_self=True, takes_field=True),
         reader="urword",
+        on_setattr=_update_maxbound,
     )
     aux: Optional[NDArray[np.float64]] = array(
         block="period",
@@ -44,6 +82,7 @@ class Chd(Package):
         default=None,
         converter=Converter(dict_to_array, takes_self=True, takes_field=True),
         reader="urword",
+        on_setattr=_update_maxbound,
     )
     boundname: Optional[NDArray[np.str_]] = array(
         block="period",
@@ -54,32 +93,10 @@ class Chd(Package):
         default=None,
         converter=Converter(dict_to_array, takes_self=True, takes_field=True),
         reader="urword",
+        on_setattr=_update_maxbound,
     )
 
     def __attrs_post_init__(self):
-        # TODO set up on_setattr hooks for period block
-        # arrays to update maxbound? for now do it here
-        # in post init. but this only works when values
-        # are set in the initializer, not when they are
-        # set later.
-        if self.head is None:
-            maxhead = 0
-        else:
-            head = self.head if self.head.data.shape == self.head.shape else self.head.todense()
-            maxhead = len(np.where(head != FILL_DNODATA))
-        if self.aux is None:
-            maxaux = 0
-        else:
-            aux = self.aux if self.aux.data.shape == self.aux.shape else self.aux.todense()
-            maxaux = len(np.where(aux != FILL_DNODATA))
-        if self.boundname is None:
-            maxboundname = 0
-        else:
-            boundname = (
-                self.boundname
-                if self.boundname.data.shape == self.boundname.shape
-                else self.boundname.todense()
-            )
-            maxboundname = len(np.where(boundname != ""))
-
-        self.maxbound = max(maxhead, maxaux, maxboundname)
+        # Trigger maxbound calculation on initialization
+        if self.head is not None or self.aux is not None or self.boundname is not None:
+            _update_maxbound(self, None, None)

flopy4/mf6/gwf/drn.py

@@ -2,7 +2,7 @@
 from typing import ClassVar, Optional
 
 import numpy as np
-from attrs import Converter
+from attrs import Converter, setters
 from numpy.typing import NDArray
 from xattree import xattree
 
@@ -12,6 +12,49 @@
 from flopy4.mf6.spec import array, field
 
 
+def _update_maxbound(instance, attribute, new_value):
+    """Update maxbound when period block arrays change."""
+    if hasattr(instance, '_updating_maxbound'):
+        return new_value
+    
+    # Calculate maxbound from all relevant arrays
+    maxbound_values = []
+    
+    # Check elev array
+    elev_val = new_value if attribute and attribute.name == 'elev' else getattr(instance, 'elev', None)
+    if elev_val is not None:
+        elev = elev_val if elev_val.data.shape == elev_val.shape else elev_val.todense()
+        maxbound_values.append(len(np.where(elev != FILL_DNODATA)[0]))
+    
+    # Check cond array
+    cond_val = new_value if attribute and attribute.name == 'cond' else getattr(instance, 'cond', None)
+    if cond_val is not None:
+        cond = cond_val if cond_val.data.shape == cond_val.shape else cond_val.todense()
+        maxbound_values.append(len(np.where(cond != FILL_DNODATA)[0]))
+    
+    # Check aux array  
+    aux_val = new_value if attribute and attribute.name == 'aux' else getattr(instance, 'aux', None)
+    if aux_val is not None:
+        aux = aux_val if aux_val.data.shape == aux_val.shape else aux_val.todense()
+        maxbound_values.append(len(np.where(aux != FILL_DNODATA)[0]))
+    
+    # Check boundname array
+    boundname_val = new_value if attribute and attribute.name == 'boundname' else getattr(instance, 'boundname', None)
+    if boundname_val is not None:
+        boundname = boundname_val if boundname_val.data.shape == boundname_val.shape else boundname_val.todense()
+        maxbound_values.append(len(np.where(boundname != "")[0]))
+    
+    # Update maxbound if we have values
+    if maxbound_values:
+        instance._updating_maxbound = True
+        try:
+            instance.maxbound = max(maxbound_values)
+        finally:
+            delattr(instance, '_updating_maxbound')
+    
+    return new_value
+
+
 @xattree
 class Drn(Package):
     multi_package: ClassVar[bool] = True
@@ -33,13 +76,15 @@ class Drn(Package):
         default=None,
         converter=Converter(dict_to_array, takes_self=True, takes_field=True),
         reader="urword",
+        on_setattr=_update_maxbound,
     )
     cond: Optional[NDArray[np.float64]] = array(
         block="period",
         dims=("nper", "nnodes"),
         default=None,
         converter=Converter(dict_to_array, takes_self=True, takes_field=True),
         reader="urword",
+        on_setattr=_update_maxbound,
     )
     aux: Optional[NDArray[np.float64]] = array(
         block="period",
@@ -50,6 +95,7 @@ class Drn(Package):
         default=None,
         converter=Converter(dict_to_array, takes_self=True, takes_field=True),
         reader="urword",
+        on_setattr=_update_maxbound,
     )
     boundname: Optional[NDArray[np.str_]] = array(
         block="period",
@@ -60,37 +106,10 @@ class Drn(Package):
         default=None,
         converter=Converter(dict_to_array, takes_self=True, takes_field=True),
         reader="urword",
+        on_setattr=_update_maxbound,
     )
 
     def __attrs_post_init__(self):
-        # TODO set up on_setattr hooks for period block
-        # arrays to update maxbound? for now do it here
-        # in post init. but this only works when values
-        # are set in the initializer, not when they are
-        # set later.
-        if self.elev is None:
-            maxelev = 0
-        else:
-            elev = self.elev if self.elev.data.shape == self.elev.shape else self.elev.todense()
-            maxelev = len(np.where(elev != FILL_DNODATA))
-        if self.cond is None:
-            maxcond = 0
-        else:
-            cond = self.cond if self.cond.data.shape == self.cond.shape else self.cond.todense()
-            maxcond = len(np.where(cond != FILL_DNODATA))
-        if self.aux is None:
-            maxaux = 0
-        else:
-            aux = self.aux if self.aux.data.shape == self.aux.shape else self.aux.todense()
-            maxaux = len(np.where(aux != FILL_DNODATA))
-        if self.boundname is None:
-            maxboundname = 0
-        else:
-            boundname = (
-                self.boundname
-                if self.boundname.data.shape == self.boundname.shape
-                else self.boundname.todense()
-            )
-            maxboundname = len(np.where(boundname != ""))
-
-        self.maxbound = max(maxelev, maxcond, maxaux, maxboundname)
+        # Trigger maxbound calculation on initialization
+        if self.elev is not None or self.cond is not None or self.aux is not None or self.boundname is not None:
+            _update_maxbound(self, None, None)

flopy4/mf6/gwf/rch.py

@@ -2,7 +2,7 @@
 from typing import ClassVar, Optional
 
 import numpy as np
-from attrs import Converter
+from attrs import Converter, setters
 from numpy.typing import NDArray
 from xattree import xattree
 
@@ -12,6 +12,43 @@
 from flopy4.mf6.spec import array, field
 
 
+def _update_maxbound(instance, attribute, new_value):
+    """Update maxbound when period block arrays change."""
+    if hasattr(instance, '_updating_maxbound'):
+        return new_value
+    
+    # Calculate maxbound from all relevant arrays
+    maxbound_values = []
+    
+    # Check recharge array
+    recharge_val = new_value if attribute and attribute.name == 'recharge' else getattr(instance, 'recharge', None)
+    if recharge_val is not None:
+        recharge = recharge_val if recharge_val.data.shape == recharge_val.shape else recharge_val.todense()
+        maxbound_values.append(len(np.where(recharge != FILL_DNODATA)[0]))
+    
+    # Check aux array  
+    aux_val = new_value if attribute and attribute.name == 'aux' else getattr(instance, 'aux', None)
+    if aux_val is not None:
+        aux = aux_val if aux_val.data.shape == aux_val.shape else aux_val.todense()
+        maxbound_values.append(len(np.where(aux != FILL_DNODATA)[0]))
+    
+    # Check boundname array
+    boundname_val = new_value if attribute and attribute.name == 'boundname' else getattr(instance, 'boundname', None)
+    if boundname_val is not None:
+        boundname = boundname_val if boundname_val.data.shape == boundname_val.shape else boundname_val.todense()
+        maxbound_values.append(len(np.where(boundname != "")[0]))
+    
+    # Update maxbound if we have values
+    if maxbound_values:
+        instance._updating_maxbound = True
+        try:
+            instance.maxbound = max(maxbound_values)
+        finally:
+            delattr(instance, '_updating_maxbound')
+    
+    return new_value
+
+
 @xattree
 class Rch(Package):
     multi_package: ClassVar[bool] = True
@@ -34,6 +71,7 @@ class Rch(Package):
         default=None,
         converter=Converter(dict_to_array, takes_self=True, takes_field=True),
         reader="urword",
+        on_setattr=_update_maxbound,
     )
     aux: Optional[NDArray[np.float64]] = array(
         block="period",
@@ -44,6 +82,7 @@ class Rch(Package):
         default=None,
         converter=Converter(dict_to_array, takes_self=True, takes_field=True),
         reader="urword",
+        on_setattr=_update_maxbound,
     )
     boundname: Optional[NDArray[np.str_]] = array(
         block="period",
@@ -54,32 +93,10 @@ class Rch(Package):
         default=None,
         converter=Converter(dict_to_array, takes_self=True, takes_field=True),
         reader="urword",
+        on_setattr=_update_maxbound,
     )
 
     def __attrs_post_init__(self):
-        # TODO set up on_setattr hooks for period block
-        # arrays to update maxbound? for now do it here
-        # in post init. but this only works when values
-        # are set in the initializer, not when they are
-        # set later.
-        if self.recharge is None:
-            maxrecharge = 0
-        else:
-            recharge = self.head if self.head.data.shape == self.head.shape else self.head.todense()
-            maxrecharge = len(np.where(recharge != FILL_DNODATA))
-        if self.aux is None:
-            maxaux = 0
-        else:
-            aux = self.aux if self.aux.data.shape == self.aux.shape else self.aux.todense()
-            maxaux = len(np.where(aux != FILL_DNODATA))
-        if self.boundname is None:
-            maxboundname = 0
-        else:
-            boundname = (
-                self.boundname
-                if self.boundname.data.shape == self.boundname.shape
-                else self.boundname.todense()
-            )
-            maxboundname = len(np.where(boundname != ""))
-
-        self.maxbound = max(maxrecharge, maxaux, maxboundname)
+        # Trigger maxbound calculation on initialization
+        if self.recharge is not None or self.aux is not None or self.boundname is not None:
+            _update_maxbound(self, None, None)