Change weight calculations for water and sediment routing

pyDeltaRCM/default.yml

@@ -84,7 +84,7 @@ save_discharge_figs:
   default: True
 save_velocity_figs:
   type: 'bool'
-  default: True
+  default: False
 save_eta_grids:
   type: 'bool'
   default: False
@@ -96,10 +96,10 @@ save_depth_grids:
   default: False
 save_discharge_grids:
   type: 'bool'
-  default: True
+  default: False
 save_velocity_grids:
   type: 'bool'
-  default: True
+  default: False
 save_dt:
   type: 'int'
   default: 50

pyDeltaRCM/deltaRCM_tools.py

@@ -39,8 +39,6 @@ def run_one_timestep(self):
 
         for iteration in range(self.itermax):
 
-            self.count = 0
-
             self.init_water_iteration()
             self.run_water_iteration()
 

pyDeltaRCM/sed_tools.py

@@ -35,6 +35,7 @@ def sed_route(self):
         self.Vp_dep_mud[:] = 0
 
         self.sand_route()
+
         self.mud_route()
 
         self.topo_diffusion()
@@ -195,16 +196,16 @@ def sed_parcel(self, theta_sed, sed, px, py):
             weight = (w1 * w2 / self.distances)
 
             weight[depth_ind <= self.dry_depth] = 0.0001
-            weight[cell_type_ind == -2] = np.nan
+            weight[cell_type_ind == -2] = 0
 
             if ind[0] == 0:
-                weight[0, :] = np.nan
+                weight[0, :] = 0
 
-            new_cell = self.random_pick(weight)
+            new_cell = self.random_pick(np.cumsum(weight.flatten()))
 
             jstep = self.iwalk.flat[new_cell]
             istep = self.jwalk.flat[new_cell]
-            dist = np.sqrt(istep**2 + jstep**2)
+            dist = np.sqrt(istep * istep + jstep * jstep)
 
             # deposition and erosion
 
@@ -254,7 +255,6 @@ def sand_route(self):
 
             self.sed_parcel(theta_sed, 'sand', px, py)
 
-#         self.topo_diffusion()
     def topo_diffusion(self):
         """
         Diffuse topography after routing all coarse sediment parcels

pyDeltaRCM/shared_tools.py

@@ -11,19 +11,13 @@ class shared_tools(object):
 
     def random_pick(self, probs):
         """
-        Randomly pick a number weighted by array probs (len 8)
+        Randomly pick a number weighted by array probabilities (len 9)
         Return the index of the selected weight in array probs
+        Takes a numpy array that is the precalculated cumulative probability
+        around the cell flattened to 1D.
         """
 
-        num_nans = sum(np.isnan(probs))
-
-        if np.nansum(probs) == 0:
-            probs[~np.isnan(probs)] = 1
-            probs[1, 1] = 0
-
-        probs[np.isnan(probs)] = 0
-        cutoffs = np.cumsum(probs)
-        idx = cutoffs.searchsorted(np.random.uniform(0, cutoffs[-1]))
+        idx = probs.searchsorted(np.random.uniform(0, probs[-1]))
 
         return idx
 
@@ -36,7 +30,7 @@ def random_pick_inlet(self, choices, probs=None):
         """
 
         if not probs:
-            probs = np.array([1 for i in range(len(choices))])
+            probs = np.ones(len(choices))
 
         cutoffs = np.cumsum(probs)
         idx = cutoffs.searchsorted(np.random.uniform(0, cutoffs[-1]))
@@ -49,4 +43,4 @@ def _get_version():
     Extract version number from single file, and make it availabe everywhere.
     """
     from . import _version
-    return _version.__version__()
+    return _version.__version__()