Skip to content

Commit ef355fe

Browse files
committed
fix attribute adjust_parameters to private
1 parent 633761c commit ef355fe

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

pywatershed/hydrology/prms_channel.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -236,13 +236,13 @@ def _initialize_channel_data(self) -> None:
236236
# inputs in place during run
237237
# should also be done before computing velocity
238238
mask_too_flat = self.seg_slope < 1e-7
239-
if mask_too_flat.any() and self.adjust_parameters != "no":
239+
if mask_too_flat.any() and self._adjust_parameters != "no":
240240
msg = (
241241
"seg_slope < 1.0e-7, set to 1.0e-4 at indices:"
242242
f"{np.where(mask_too_flat)[0]}"
243243
)
244244
warn(msg, UserWarning)
245-
if self.adjust_parameters == "error":
245+
if self._adjust_parameters == "error":
246246
raise ValueError(
247247
"seg_slope parameter values were edited and an error was "
248248
"requested. See warnings for additional details."

pywatershed/hydrology/prms_soilzone.py

+14-14
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,8 @@ def _set_initial_conditions(self):
305305

306306
throw_error = False
307307
mask = self.soil_moist_max < 1.0e-5
308-
if mask.any() and self.adjust_parameters != "no":
309-
if self.adjust_parameters == "error":
308+
if mask.any() and self._adjust_parameters != "no":
309+
if self._adjust_parameters == "error":
310310
throw_error = True
311311
msg = (
312312
"soil_moist_max < 1.0e-5, set to 1.0e-5 at indices: "
@@ -316,8 +316,8 @@ def _set_initial_conditions(self):
316316
self.soil_moist_max = np.where(mask, 1.0e-5, self.soil_moist_max)
317317

318318
mask = self.soil_rechr_max < 1.0e-5
319-
if mask.any() and self.adjust_parameters != "no":
320-
if self.adjust_parameters == "error":
319+
if mask.any() and self._adjust_parameters != "no":
320+
if self._adjust_parameters == "error":
321321
throw_error = True
322322
msg = (
323323
"soil_rechr_max < 1.0e-5, set to 1.0e-5 at indices: "
@@ -327,8 +327,8 @@ def _set_initial_conditions(self):
327327
self.soil_rechr_max = np.where(mask, 1.0e-5, self.soil_rechr_max)
328328

329329
mask = self.soil_rechr_max > self.soil_moist_max
330-
if mask.any() and self.adjust_parameters != "no":
331-
if self.adjust_parameters == "error":
330+
if mask.any() and self._adjust_parameters != "no":
331+
if self._adjust_parameters == "error":
332332
throw_error = True
333333
msg = (
334334
"soil_rechr_max > soil_moist_max, "
@@ -343,8 +343,8 @@ def _set_initial_conditions(self):
343343
)
344344

345345
mask = self.soil_rechr > self.soil_rechr_max
346-
if mask.any() and self.adjust_parameters != "no":
347-
if self.adjust_parameters == "error":
346+
if mask.any() and self._adjust_parameters != "no":
347+
if self._adjust_parameters == "error":
348348
throw_error = True
349349
msg = (
350350
"soil_rechr_init > soil_rechr_max, "
@@ -359,8 +359,8 @@ def _set_initial_conditions(self):
359359
)
360360

361361
mask = self.soil_moist > self.soil_moist_max
362-
if mask.any() and self.adjust_parameters != "no":
363-
if self.adjust_parameters == "error":
362+
if mask.any() and self._adjust_parameters != "no":
363+
if self._adjust_parameters == "error":
364364
throw_error = True
365365
msg = (
366366
"soil_moist_init > soil_moist_max, "
@@ -375,8 +375,8 @@ def _set_initial_conditions(self):
375375
)
376376

377377
mask = self.soil_rechr > self.soil_moist
378-
if mask.any() and self.adjust_parameters != "no":
379-
if self.adjust_parameters == "error":
378+
if mask.any() and self._adjust_parameters != "no":
379+
if self._adjust_parameters == "error":
380380
throw_error = True
381381
msg = (
382382
"soil_rechr > soil_moist, "
@@ -387,8 +387,8 @@ def _set_initial_conditions(self):
387387
self.soil_rechr = np.where(mask, self.soil_moist, self.soil_rechr)
388388

389389
mask = self.ssres_stor > self._sat_threshold
390-
if mask.any() and self.adjust_parameters != "no":
391-
if self.adjust_parameters == "error":
390+
if mask.any() and self._adjust_parameters != "no":
391+
if self._adjust_parameters == "error":
392392
throw_error = True
393393
msg = (
394394
"ssres_stor > _sat_threshold, "

0 commit comments

Comments
 (0)