Merge pull request landlab#1956 from landlab/mcflugen/numpy-2

Update for numpy v2

landlab/__init__.py

@@ -9,6 +9,8 @@
 :URL: https://landlab.readthedocs.io/en/release/
 :License: MIT
 """
+import numpy as np
+
 from landlab._registry import registry
 from landlab._version import __version__
 from landlab.core.errors import MissingKeyError
@@ -33,6 +35,8 @@
 from landlab.plot.imshowhs import imshowhs_grid
 from landlab.plot.imshowhs import imshowhs_grid_at_node
 
+np.set_printoptions(legacy="1.25")
+
 cite_as = registry.format_citations
 
 __all__ = [

landlab/ca/boundaries/hex_lattice_tectonicizer.py

@@ -1015,7 +1015,9 @@ def shift_link_and_transition_data_upward(self, ca, current_time):
             tns = self.node_state[self.grid.node_at_link_head[lk]]
             orientation = ca.link_orientation[lk]
             new_link_state = (
-                orientation * ca.num_node_states_sq + fns * ca.num_node_states + tns
+                int(orientation) * ca.num_node_states_sq
+                + fns * ca.num_node_states
+                + tns
             )
 
             # Schedule a new transition, if applicable

landlab/ca/celllab_cts.py

@@ -471,8 +471,8 @@ def __init__(
         # are tracked.
         self.propid = np.arange(self.grid.number_of_nodes)
         if prop_data is None:
-            self.prop_data = np.zeros(self.grid.number_of_nodes)
-            self.prop_reset_value = 0.0
+            self.prop_data = np.zeros(self.grid.number_of_nodes, dtype=int)
+            self.prop_reset_value = 0
         else:
             self.prop_data = prop_data
             self.prop_reset_value = prop_reset_value
@@ -681,7 +681,9 @@ def update_link_state_new(self, link, new_link_state, current_time):
             tns = self.node_state[self.grid.node_at_link_head[link]]
             orientation = self.link_orientation[link]
             new_link_state = int(
-                orientation * self.num_node_states_sq + fns * self.num_node_states + tns
+                int(orientation) * self.num_node_states_sq
+                + fns * self.num_node_states
+                + tns
             )
 
         self.link_state[link] = new_link_state