fix(#886): MFArray aux variable now always returned as an numpy.ndarr…

…ay. Fixed problem with PyListUtil not fully supporting numpy.ndarray type. (#887)
modflowpy · May 19, 2020 · f4e5ed3 · f4e5ed3
1 parent 29d7f84
commit f4e5ed3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/flopy/mf6/data/mfdatastorage.py b/flopy/mf6/data/mfdatastorage.py
@@ -1648,7 +1648,7 @@ def _build_full_data(self, apply_multiplier=False):
             if all_none:
                 return None
             else:
-                return aux_data
+                return np.stack(aux_data, axis=0)
         else:
             return full_data
 

diff --git a/flopy/utils/datautil.py b/flopy/utils/datautil.py
@@ -161,11 +161,12 @@ def max_multi_dim_list_size(current_list):
 
     @staticmethod
     def first_item(current_list):
-        if not isinstance(current_list, list):
+        if not isinstance(current_list, list) and not isinstance\
+                (current_list, np.ndarray):
             return current_list
 
         for item in current_list:
-            if isinstance(item, list):
+            if isinstance(item, list) or isinstance(item, np.ndarray):
                 # still in a list of lists, recurse
                 return PyListUtil.first_item(item)
             else:
@@ -200,11 +201,12 @@ def next_item(current_list, new_list=True, nesting_change=0,
 
     @staticmethod
     def next_list(current_list):
-        if not isinstance(current_list[0], list):
+        if not isinstance(current_list[0], list) and not \
+                isinstance(current_list[0], np.ndarray):
             yield current_list
         else:
             for lst in current_list:
-                if isinstance(lst[0], list):
+                if isinstance(lst[0], list) or isinstance(lst[0], np.ndarray):
                     for lst in PyListUtil.next_list(lst):
                         yield lst
                 else: