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

reV/supply_curve/sc_aggregation.py

@@ -28,7 +28,7 @@ from reV.supply_curve.aggregation import (
 from reV.supply_curve.exclusions import FrictionMask
 from reV.supply_curve.extent import SupplyCurveExtent
 from reV.supply_curve.points import GenerationSupplyCurvePoint
-from reV.utilities import SupplyCurveField, log_versions
+from reV.utilities import ResourceMetaField, SupplyCurveField, log_versions
 from reV.utilities.exceptions import (
     EmptySupplyCurvePointError,
     FileInputError,
@@ -170,14 +170,14 @@ class SupplyCurveAggFileHandler(AbstractAggFileHandler):
 
             if self._pdf.endswith(".csv"):
                 self._power_density = pd.read_csv(self._pdf)
-                if (SupplyCurveField.GID in self._power_density
+                if (ResourceMetaField.GID in self._power_density
                         and 'power_density' in self._power_density):
                     self._power_density = \
-                        self._power_density.set_index(SupplyCurveField.GID)
+                        self._power_density.set_index(ResourceMetaField.GID)
                 else:
                     msg = ('Variable power density file must include "{}" '
                            'and "power_density" columns, but received: {}'
-                           .format(SupplyCurveField.GID,
+                           .format(ResourceMetaField.GID,
                                    self._power_density.columns.values))
                     logger.error(msg)
                     raise FileInputError(msg)
@@ -712,13 +712,6 @@ class SupplyCurveAggregation(BaseAggregation):
 
         logger.debug("Resource class bins: {}".format(self._res_class_bins))
 
-        if self._cap_cost_scale is not None:
-            if self._h5_dsets is None:
-                self._h5_dsets = []
-
-            self._h5_dsets += list(BaseGen.LCOE_ARGS)
-            self._h5_dsets = list(set(self._h5_dsets))
-
         if self._power_density is None:
             msg = (
                 "Supply curve aggregation power density not specified. "
@@ -784,7 +777,7 @@ class SupplyCurveAggregation(BaseAggregation):
 
     @staticmethod
     def _get_res_gen_lcoe_data(
-        gen, res_class_dset, res_class_bins, cf_dset, lcoe_dset
+        gen, res_class_dset, res_class_bins, lcoe_dset
     ):
         """Extract the basic resource / generation / lcoe data to be used in
         the aggregation process.
@@ -800,8 +793,6 @@ class SupplyCurveAggregation(BaseAggregation):
         res_class_bins : list | None
             List of two-entry lists dictating the resource class bins.
             None if no resource classes.
-        cf_dset : str
-            Dataset name from f_gen containing capacity factor mean values.
         lcoe_dset : str
             Dataset name from f_gen containing LCOE mean values.
 
@@ -811,16 +802,14 @@ class SupplyCurveAggregation(BaseAggregation):
             Extracted resource data from res_class_dset
         res_class_bins : list
             List of resouce class bin ranges.
-        cf_data : np.ndarray | None
-            Capacity factor data extracted from cf_dset in gen
         lcoe_data : np.ndarray | None
             LCOE data extracted from lcoe_dset in gen
         """
 
-        dset_list = (res_class_dset, cf_dset, lcoe_dset)
+        dset_list = (res_class_dset, lcoe_dset)
         gen_dsets = [] if gen is None else gen.datasets
-        labels = ("res_class_dset", "cf_dset", "lcoe_dset")
-        temp = [None, None, None]
+        labels = ("res_class_dset", "lcoe_dset")
+        temp = [None, None]
 
         if isinstance(gen, Resource):
             source_fps = [gen.h5_file]
@@ -847,12 +836,12 @@ class SupplyCurveAggregation(BaseAggregation):
                 logger.warning(w)
                 warn(w, OutputWarning)
 
-        res_data, cf_data, lcoe_data = temp
+        res_data, lcoe_data = temp
 
         if res_class_dset is None or res_class_bins is None:
             res_class_bins = [None]
 
-        return res_data, res_class_bins, cf_data, lcoe_data
+        return res_data, res_class_bins, lcoe_data
 
     @staticmethod
     def _get_extra_dsets(gen, h5_dsets):
@@ -886,7 +875,6 @@ class SupplyCurveAggregation(BaseAggregation):
                            'system_capacity')
         missing_lcoe_source = [k for k in lcoe_recalc_req
                                if k not in gen_dsets]
-        missing_lcoe_request = []
 
         if isinstance(gen, Resource):
             source_fps = [gen.h5_file]
@@ -901,9 +889,6 @@ class SupplyCurveAggregation(BaseAggregation):
 
         h5_dsets_data = None
         if h5_dsets is not None:
-            missing_lcoe_request = [
-                k for k in lcoe_recalc_req if k not in h5_dsets
-            ]
 
             if not isinstance(h5_dsets, (list, tuple)):
                 e = (
@@ -937,17 +922,6 @@ class SupplyCurveAggregation(BaseAggregation):
             logger.warning(msg)
             warn(msg, InputWarning)
 
-        if any(missing_lcoe_request):
-            msg = (
-                "It is strongly advised that you include the following "
-                "datasets in the h5_dsets request in order to re-calculate "
-                "the LCOE from the multi-year mean CF and AEP: {}".format(
-                    missing_lcoe_request
-                )
-            )
-            logger.warning(msg)
-            warn(msg, InputWarning)
-
         return h5_dsets_data
 
     @classmethod
@@ -1079,7 +1053,6 @@ class SupplyCurveAggregation(BaseAggregation):
         summary = []
 
         with SupplyCurveExtent(excl_fpath, resolution=resolution) as sc:
-            points = sc.points
             exclusion_shape = sc.exclusions.shape
             if gids is None:
                 gids = sc.valid_sc_points(tm_dset)
@@ -1110,9 +1083,9 @@ class SupplyCurveAggregation(BaseAggregation):
             excl_fpath, gen_fpath, **file_kwargs
         ) as fh:
             temp = cls._get_res_gen_lcoe_data(
-                fh.gen, res_class_dset, res_class_bins, cf_dset, lcoe_dset
+                fh.gen, res_class_dset, res_class_bins, lcoe_dset
             )
-            res_data, res_class_bins, cf_data, lcoe_data = temp
+            res_data, res_class_bins, lcoe_data = temp
             h5_dsets_data = cls._get_extra_dsets(fh.gen, h5_dsets)
 
             n_finished = 0
@@ -1131,7 +1104,7 @@ class SupplyCurveAggregation(BaseAggregation):
                             gen_index,
                             res_class_dset=res_data,
                             res_class_bin=res_bin,
-                            cf_dset=cf_data,
+                            cf_dset=cf_dset,
                             lcoe_dset=lcoe_data,
                             h5_dsets=h5_dsets_data,
                             data_layers=fh.data_layers,
@@ -1151,11 +1124,6 @@ class SupplyCurveAggregation(BaseAggregation):
                     except EmptySupplyCurvePointError:
                         logger.debug("SC point {} is empty".format(gid))
                     else:
-                        pointsum[SupplyCurveField.SC_POINT_GID] = gid
-                        pointsum[SupplyCurveField.SC_ROW_IND] = \
-                            points.loc[gid, 'row_ind']
-                        pointsum[SupplyCurveField.SC_COL_IND] = \
-                            points.loc[gid, 'col_ind']
                         pointsum['res_class'] = ri
 
                         summary.append(pointsum)