NREL-reV 0.8.7__py3-none-any.whl → 0.8.9__py3-none-any.whl

reV/handlers/exclusions.py

@@ -2,17 +2,18 @@
 """
 Exclusion layers handler
 """
-import logging
 import json
+import logging
+
 import numpy as np
+from rex.multi_file_resource import MultiFileResource
+from rex.resource import Resource
+from rex.utilities.parse_keys import parse_keys
 
 from reV.utilities.exceptions import HandlerKeyError, MultiFileExclusionError
 
-from rex.utilities.parse_keys import parse_keys
-from rex.resource import Resource
-from rex.multi_file_resource import MultiFileResource
-
 logger = logging.getLogger(__name__)
+LATITUDE, LONGITUDE = "latitude", "longitude"
 
 
 class ExclusionLayers:
@@ -81,8 +82,8 @@ class ExclusionLayers:
 
     def _preflight_multi_file(self):
         """Run simple multi-file exclusion checks."""
-        lat_shape = self.h5.shapes['latitude']
-        lon_shape = self.h5.shapes['longitude']
+        lat_shape = self.h5.shapes[LATITUDE]
+        lon_shape = self.h5.shapes[LONGITUDE]
         for layer in self.layers:
             lshape = self.h5.shapes[layer]
             lshape = lshape[1:] if len(lshape) > 2 else lshape
@@ -231,7 +232,7 @@ class ExclusionLayers:
         """
         shape = self.h5.attrs.get('shape', None)
         if shape is None:
-            shape = self.h5.shapes['latitude']
+            shape = self.h5.shapes[LATITUDE]
 
         return tuple(shape)
 
@@ -247,7 +248,7 @@ class ExclusionLayers:
         """
         chunks = self.h5.attrs.get('chunks', None)
         if chunks is None:
-            chunks = self.h5.chunks['latitude']
+            chunks = self.h5.chunks[LATITUDE]
 
         return chunks
 
@@ -260,7 +261,7 @@ class ExclusionLayers:
         -------
         ndarray
         """
-        return self['latitude']
+        return self[LATITUDE]
 
     @property
     def longitude(self):
@@ -271,7 +272,7 @@ class ExclusionLayers:
         -------
         ndarray
         """
-        return self['longitude']
+        return self[LONGITUDE]
 
     def get_layer_profile(self, layer):
         """
@@ -384,13 +385,13 @@ class ExclusionLayers:
         lat : ndarray
             Latitude coordinates
         """
-        if 'latitude' not in self.h5:
+        if LATITUDE not in self.h5:
             msg = ('"latitude" is missing from {}'
                    .format(self.h5_file))
             logger.error(msg)
             raise HandlerKeyError(msg)
 
-        ds_slice = ('latitude', ) + ds_slice
+        ds_slice = (LATITUDE, ) + ds_slice
 
         lat = self.h5[ds_slice]
 
@@ -410,13 +411,13 @@ class ExclusionLayers:
         lon : ndarray
             Longitude coordinates
         """
-        if 'longitude' not in self.h5:
+        if LONGITUDE not in self.h5:
             msg = ('"longitude" is missing from {}'
                    .format(self.h5_file))
             logger.error(msg)
             raise HandlerKeyError(msg)
 
-        ds_slice = ('longitude', ) + ds_slice
+        ds_slice = (LONGITUDE, ) + ds_slice
 
         lon = self.h5[ds_slice]
 

reV/handlers/multi_year.py

@@ -3,22 +3,25 @@
 Classes to collect reV outputs from multiple annual files.
 """
 import glob
-import time
 import logging
-import numpy as np
 import os
-import pandas as pd
+import time
 from warnings import warn
 
-from rex import Resource
-from rex.utilities.utilities import (get_class_properties, parse_year,
-                                     get_lat_lon_cols)
+import numpy as np
+import pandas as pd
 from gaps.pipeline import parse_previous_status
+from rex import Resource
+from rex.utilities.utilities import (
+    get_class_properties,
+    get_lat_lon_cols,
+    parse_year,
+)
 
-from reV.handlers.outputs import Outputs
 from reV.config.output_request import SAMOutputRequest
-from reV.utilities.exceptions import HandlerRuntimeError, ConfigError
-from reV.utilities import log_versions, ModuleName
+from reV.handlers.outputs import Outputs
+from reV.utilities import ModuleName, log_versions
+from reV.utilities.exceptions import ConfigError, HandlerRuntimeError
 
 logger = logging.getLogger(__name__)
 

reV/handlers/outputs.py

@@ -2,15 +2,16 @@
 """
 Classes to handle reV h5 output files.
 """
+import json
 import logging
+import sys
+
 import NRWAL
 import PySAM
 import rex
-import sys
-import json
+from rex.outputs import Outputs as rexOutputs
 
 from reV.version import __version__
-from rex.outputs import Outputs as rexOutputs
 
 logger = logging.getLogger(__name__)
 
@@ -28,8 +29,8 @@ class Outputs(rexOutputs):
     >>> import pandas as pd
     >>> import numpy as np
     >>>
-    >>> meta = pd.DataFrame({'latitude': np.ones(100),
-    >>>                      'longitude': np.ones(100)})
+    >>> meta = pd.DataFrame({SupplyCurveField.LATITUDE: np.ones(100),
+    >>>                      SupplyCurveField.LONGITUDE: np.ones(100)})
     >>>
     >>> time_index = pd.date_range('20210101', '20220101', freq='1h',
     >>>                            closed='right')

reV/hybrids/hybrid_methods.py

@@ -3,18 +3,12 @@
 
 @author: ppinchuk
 """
+from reV.utilities import SupplyCurveField
 
 
 def aggregate_solar_capacity(h):
     """Compute the total solar capcity allowed in hybridization.
 
-    Note
-    ----
-    No limiting is done on the ratio of wind to solar. This method
-    checks for an existing 'hybrid_solar_capacity'. If one does not exist,
-    it is assumed that there is no limit on the solar to wind capacity
-    ratio and the solar capacity is copied into this new column.
-
     Parameters
     ----------
     h : `reV.hybrids.Hybridization`
@@ -26,27 +20,25 @@ def aggregate_solar_capacity(h):
     -------
     data : Series | None
         A series of data containing the capacity allowed in the hybrid
-        capacity sum, or `None` if 'hybrid_solar_capacity' already exists.
+        capacity sum, or `None` if 'hybrid_solar_capacity' already
+        exists.
 
     Notes
     -----
-
+    No limiting is done on the ratio of wind to solar. This method
+    checks for an existing 'hybrid_solar_capacity'. If one does not
+    exist, it is assumed that there is no limit on the solar to wind
+    capacity ratio and the solar capacity is copied into this new
+    column.
     """
-    if 'hybrid_solar_capacity' in h.hybrid_meta:
+    if f'hybrid_solar_{SupplyCurveField.CAPACITY}' in h.hybrid_meta:
         return None
-    return h.hybrid_meta['solar_capacity']
+    return h.hybrid_meta[f'solar_{SupplyCurveField.CAPACITY}']
 
 
 def aggregate_wind_capacity(h):
     """Compute the total wind capcity allowed in hybridization.
 
-    Note
-    ----
-    No limiting is done on the ratio of wind to solar. This method
-    checks for an existing 'hybrid_wind_capacity'. If one does not exist,
-    it is assumed that there is no limit on the solar to wind capacity
-    ratio and the wind capacity is copied into this new column.
-
     Parameters
     ----------
     h : `reV.hybrids.Hybridization`
@@ -58,15 +50,19 @@ def aggregate_wind_capacity(h):
     -------
     data : Series | None
         A series of data containing the capacity allowed in the hybrid
-        capacity sum, or `None` if 'hybrid_solar_capacity' already exists.
+        capacity sum, or `None` if 'hybrid_solar_capacity' already
+        exists.
 
     Notes
     -----
-
+    No limiting is done on the ratio of wind to solar. This method
+    checks for an existing 'hybrid_wind_capacity'. If one does not
+    exist, it is assumed that there is no limit on the solar to wind
+    capacity ratio and the wind capacity is copied into this new column.
     """
-    if 'hybrid_wind_capacity' in h.hybrid_meta:
+    if f'hybrid_wind_{SupplyCurveField.CAPACITY}' in h.hybrid_meta:
         return None
-    return h.hybrid_meta['wind_capacity']
+    return h.hybrid_meta[f'wind_{SupplyCurveField.CAPACITY}']
 
 
 def aggregate_capacity(h):
@@ -85,8 +81,8 @@ def aggregate_capacity(h):
         A series of data containing the aggregated capacity, or `None`
         if the capacity columns are missing.
     """
-
-    sc, wc = 'hybrid_solar_capacity', 'hybrid_wind_capacity'
+    sc = f'hybrid_solar_{SupplyCurveField.CAPACITY}'
+    wc = f'hybrid_wind_{SupplyCurveField.CAPACITY}'
     missing_solar_cap = sc not in h.hybrid_meta.columns
     missing_wind_cap = wc not in h.hybrid_meta.columns
     if missing_solar_cap or missing_wind_cap:
@@ -113,8 +109,10 @@ def aggregate_capacity_factor(h):
         if the capacity and/or mean_cf columns are missing.
     """
 
-    sc, wc = 'hybrid_solar_capacity', 'hybrid_wind_capacity'
-    scf, wcf = 'solar_mean_cf', 'wind_mean_cf'
+    sc = f'hybrid_solar_{SupplyCurveField.CAPACITY}'
+    wc = f'hybrid_wind_{SupplyCurveField.CAPACITY}'
+    scf = f'solar_{SupplyCurveField.MEAN_CF}'
+    wcf = f'wind_{SupplyCurveField.MEAN_CF}'
     missing_solar_cap = sc not in h.hybrid_meta.columns
     missing_wind_cap = wc not in h.hybrid_meta.columns
     missing_solar_mean_cf = scf not in h.hybrid_meta.columns
@@ -132,8 +130,8 @@ def aggregate_capacity_factor(h):
 
 
 HYBRID_METHODS = {
-    'hybrid_solar_capacity': aggregate_solar_capacity,
-    'hybrid_wind_capacity': aggregate_wind_capacity,
-    'hybrid_capacity': aggregate_capacity,
-    'hybrid_mean_cf': aggregate_capacity_factor
+    f'hybrid_solar_{SupplyCurveField.CAPACITY}': aggregate_solar_capacity,
+    f'hybrid_wind_{SupplyCurveField.CAPACITY}': aggregate_wind_capacity,
+    f'hybrid_{SupplyCurveField.CAPACITY}': aggregate_capacity,
+    f'hybrid_{SupplyCurveField.MEAN_CF}': aggregate_capacity_factor
 }