From 6058a0f816289c86773b80a6f77ef4a58f5e5dc4 Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 10 Mar 2025 11:30:47 -0500 Subject: [PATCH 1/3] relocate initialization of water start indices to that these can be modified by hooking. --- pyDeltaRCM/water_tools.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pyDeltaRCM/water_tools.py b/pyDeltaRCM/water_tools.py index 786b4bba..026a811a 100644 --- a/pyDeltaRCM/water_tools.py +++ b/pyDeltaRCM/water_tools.py @@ -58,6 +58,12 @@ def init_water_iteration(self) -> None: self.pad_depth = np.pad(self.depth, 1, "edge") self.pad_cell_type = np.pad(self.cell_type, 1, "edge") + # configure the starting indices for each parcel + inlet_weights = self.get_inlet_weights_water() + self.start_indices = shared_tools.get_start_indices( + self.inlet, inlet_weights, self._Np_water + ) + def get_inlet_weights_water(self, **kwargs): """Get weight for inlet cells for water parcels. @@ -91,11 +97,8 @@ def run_water_iteration(self) -> None: _msg = "Beginning stepping of water parcels" self.log_info(_msg, verbosity=2) - # configure the starting indices for each parcel - inlet_weights = self.get_inlet_weights_water() - start_indices = shared_tools.get_start_indices( - self.inlet, inlet_weights, self._Np_water - ) + # grab from initialization step + start_indices = self.start_indices # init parcel step number counter _step = 0 @@ -691,7 +694,8 @@ def _get_weight_at_cell_water( weight[~wall] = 1 / nnotwall else: raise RuntimeError( - "No non-wall cells surrounding cell. " "Please report error." + "No non-wall cells surrounding cell." + "Please report error including logfile." ) weight = weight / np.sum(weight) From 01389acc1b025ff6c2cad94d584a8bd0f7587494 Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 10 Mar 2025 11:31:03 -0500 Subject: [PATCH 2/3] cleanup comments. --- pyDeltaRCM/init_tools.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyDeltaRCM/init_tools.py b/pyDeltaRCM/init_tools.py index e30d0ebf..ce11dddf 100644 --- a/pyDeltaRCM/init_tools.py +++ b/pyDeltaRCM/init_tools.py @@ -386,7 +386,6 @@ def set_constants(self) -> None: # kernels for topographic smoothing self.kernel1 = np.array([[1, 1, 1], [1, -8, 1], [1, 1, 1]]).astype(np.int64) - self.kernel2 = np.array([[1, 1, 1], [1, 0, 1], [1, 1, 1]]).astype(np.int64) def create_boundary_conditions(self) -> None: @@ -434,7 +433,7 @@ def create_boundary_conditions(self) -> None: # at inlet self.qw0 = self.u0 * self.h0 # water unit input discharge - self.Qp_water = self.Qw0 / self._Np_water # volume each water parcel + self.Qp_water = self.Qw0 / self._Np_water # discharge each water parcel self.qs0 = self.qw0 * self.C0 # sed unit discharge self.dVs = 0.1 * self.N0**2 * self.V0 # total sed added per timestep self.Qs0 = self.Qw0 * self.C0 # sediment total input discharge From 4aa986b5d348b46d3d43b5348c32048ac8158631 Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 9 Feb 2026 19:40:48 -0600 Subject: [PATCH 3/3] increment version for last planned 2.1.x release --- pyDeltaRCM/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyDeltaRCM/_version.py b/pyDeltaRCM/_version.py index 6b670869..86aff2ec 100644 --- a/pyDeltaRCM/_version.py +++ b/pyDeltaRCM/_version.py @@ -3,4 +3,4 @@ def __version__() -> str: Private version declaration, gets assigned to pyDeltaRCM.__version__ during import """ - return "2.1.5" + return "2.1.10"