lint

pywatershed/atmosphere/prms_atmosphere.py

@@ -8,7 +8,7 @@
 
 from ..base.adapter import adaptable
 from ..base.control import Control
-from ..constants import nearzero, inch2cm, nan, one, zero
+from ..constants import inch2cm, nan, nearzero, one, zero
 from ..parameters import Parameters
 from ..utils.time_utils import datetime_doy, datetime_month
 from .solar_constants import solf

pywatershed/hydrology/prms_canopy.py

@@ -10,11 +10,11 @@
 from ..constants import (
     CovType,
     HruType,
+    dnearzero,
     nan,
+    nearzero,
     numba_num_threads,
     zero,
-    dnearzero,
-    nearzero,
 )
 from ..parameters import Parameters
 

pywatershed/hydrology/prms_runoff.py

@@ -10,8 +10,8 @@
 from ..constants import (
     HruType,
     dnearzero,
-    nearzero,
     nan,
+    nearzero,
     numba_num_threads,
     zero,
 )

pywatershed/hydrology/prms_snow.py

@@ -11,9 +11,9 @@
     HruType,
     closezero,
     dnearzero,
-    nearzero,
     inch2cm,
     nan,
+    nearzero,
     numba_num_threads,
     one,
     zero,

pywatershed/hydrology/prms_soilzone.py

@@ -12,9 +12,9 @@
     HruType,
     SoilType,
     nan,
+    nearzero,
     numba_num_threads,
     one,
-    nearzero,
     zero,
 )
 from ..parameters import Parameters
@@ -89,6 +89,9 @@ def __init__(
         self._set_inputs(locals())
         self._set_options(locals())
 
+        # This uses options
+        self._initialize_soilzone_data()
+
         self._set_budget()
         self._init_calc_method()
 
@@ -214,6 +217,10 @@ def get_mass_budget_terms():
         }
 
     def _set_initial_conditions(self):
+        # this is called in the super before options are set on self
+        pass
+
+    def _initialize_soilzone_data(self):
         # Derived parameters
         # JLM: is this awkward here?
         # JLM: it's definitely awkward to edit a parameter. maybe