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

reV/supply_curve/tech_mapping.py

@@ -8,21 +8,21 @@ Created on Fri Jun 21 16:05:47 2019
 
 @author: gbuster
 """
-from concurrent.futures import as_completed
-import h5py
 import logging
-from math import ceil
-import numpy as np
 import os
-from scipy.spatial import cKDTree
+from concurrent.futures import as_completed
+from math import ceil
 from warnings import warn
 
-from reV.supply_curve.extent import SupplyCurveExtent
-from reV.utilities.exceptions import FileInputWarning, FileInputError
-
+import h5py
+import numpy as np
 from rex.resource import Resource
 from rex.utilities.execution import SpawnProcessPool
 from rex.utilities.utilities import res_dist_threshold
+from scipy.spatial import cKDTree
+
+from reV.supply_curve.extent import SupplyCurveExtent, LATITUDE, LONGITUDE
+from reV.utilities.exceptions import FileInputError, FileInputWarning
 
 logger = logging.getLogger(__name__)
 
@@ -30,8 +30,9 @@ logger = logging.getLogger(__name__)
 class TechMapping:
     """Framework to create map between tech layer (exclusions), res, and gen"""
 
-    def __init__(self, excl_fpath, res_fpath, sc_resolution=2560,
-                 dist_margin=1.05):
+    def __init__(
+        self, excl_fpath, res_fpath, sc_resolution=2560, dist_margin=1.05
+    ):
         """
         Parameters
         ----------
@@ -51,11 +52,13 @@ class TechMapping:
         self._excl_fpath = excl_fpath
         self._check_fout()
 
-        self._tree, self._dist_thresh = \
-            self._build_tree(res_fpath, dist_margin=dist_margin)
+        self._tree, self._dist_thresh = self._build_tree(
+            res_fpath, dist_margin=dist_margin
+        )
 
-        with SupplyCurveExtent(self._excl_fpath,
-                               resolution=sc_resolution) as sc:
+        with SupplyCurveExtent(
+            self._excl_fpath, resolution=sc_resolution
+        ) as sc:
             self._sc_resolution = sc.resolution
             self._gids = np.array(list(range(len(sc))), dtype=np.uint32)
             self._excl_shape = sc.exclusions.shape
@@ -64,9 +67,12 @@ class TechMapping:
             self._sc_col_indices = sc.col_indices
             self._excl_row_slices = sc.excl_row_slices
             self._excl_col_slices = sc.excl_col_slices
-            logger.info('Initialized TechMapping object with {} calc chunks '
-                        'for {} tech exclusion points'
-                        .format(len(self._gids), self._n_excl))
+            logger.info(
+                "Initialized TechMapping object with {} calc chunks "
+                "for {} tech exclusion points".format(
+                    len(self._gids), self._n_excl
+                )
+            )
 
     @property
     def distance_threshold(self):
@@ -110,8 +116,9 @@ class TechMapping:
         # pylint: disable=not-callable
         tree = cKDTree(lat_lons)
 
-        dist_thresh = res_dist_threshold(lat_lons, tree=tree,
-                                         margin=dist_margin)
+        dist_thresh = res_dist_threshold(
+            lat_lons, tree=tree, margin=dist_margin
+        )
 
         return tree, dist_thresh
 
@@ -135,8 +142,9 @@ class TechMapping:
         return iarr.reshape(shape)
 
     @staticmethod
-    def _get_excl_slices(gid, sc_row_indices, sc_col_indices, excl_row_slices,
-                         excl_col_slices):
+    def _get_excl_slices(
+        gid, sc_row_indices, sc_col_indices, excl_row_slices, excl_col_slices
+    ):
         """
         Get the row and column slices of the exclusions grid corresponding
         to the supply curve point gid.
@@ -175,7 +183,7 @@ class TechMapping:
     @classmethod
     def _get_excl_coords(cls, excl_fpath, gids, sc_row_indices, sc_col_indices,
                          excl_row_slices, excl_col_slices,
-                         coord_labels=('latitude', 'longitude')):
+                         coord_labels=(LATITUDE, LONGITUDE)):
         """
         Extract the exclusion coordinates for teh desired gids for TechMapping.
 
@@ -210,21 +218,25 @@ class TechMapping:
             tech exclusion points. List entries correspond to input gids.
         """
         coords_out = []
-        with h5py.File(excl_fpath, 'r') as f:
+        with h5py.File(excl_fpath, "r") as f:
             for gid in gids:
-                row_slice, col_slice = cls._get_excl_slices(gid,
-                                                            sc_row_indices,
-                                                            sc_col_indices,
-                                                            excl_row_slices,
-                                                            excl_col_slices)
+                row_slice, col_slice = cls._get_excl_slices(
+                    gid,
+                    sc_row_indices,
+                    sc_col_indices,
+                    excl_row_slices,
+                    excl_col_slices,
+                )
                 try:
                     lats = f[coord_labels[0]][row_slice, col_slice]
                     lons = f[coord_labels[1]][row_slice, col_slice]
                     emeta = np.vstack((lats.flatten(), lons.flatten())).T
                 except Exception as e:
-                    m = ('Could not unpack coordinates for gid {} with '
-                         'row/col slice {}/{}. Received the following '
-                         'error:\n{}'.format(gid, row_slice, col_slice, e))
+                    m = (
+                        "Could not unpack coordinates for gid {} with "
+                        "row/col slice {}/{}. Received the following "
+                        "error:\n{}".format(gid, row_slice, col_slice, e)
+                    )
                     logger.error(m)
                     raise e
 
@@ -233,9 +245,17 @@ class TechMapping:
         return coords_out
 
     @classmethod
-    def map_resource_gids(cls, gids, excl_fpath, sc_row_indices,
-                          sc_col_indices, excl_row_slices, excl_col_slices,
-                          tree, dist_thresh):
+    def map_resource_gids(
+        cls,
+        gids,
+        excl_fpath,
+        sc_row_indices,
+        sc_col_indices,
+        excl_row_slices,
+        excl_col_slices,
+        tree,
+        dist_thresh,
+    ):
         """Map exclusion gids to the resource meta.
 
         Parameters
@@ -272,15 +292,26 @@ class TechMapping:
             List of arrays of index values from the NN. List entries correspond
             to input gids.
         """
-        logger.debug('Getting tech map coordinates for chunks {} through {}'
-                     .format(gids[0], gids[-1]))
+        logger.debug(
+            "Getting tech map coordinates for chunks {} through {}".format(
+                gids[0], gids[-1]
+            )
+        )
         ind_out = []
-        coords_out = cls._get_excl_coords(excl_fpath, gids, sc_row_indices,
-                                          sc_col_indices, excl_row_slices,
-                                          excl_col_slices)
-
-        logger.debug('Running tech mapping for chunks {} through {}'
-                     .format(gids[0], gids[-1]))
+        coords_out = cls._get_excl_coords(
+            excl_fpath,
+            gids,
+            sc_row_indices,
+            sc_col_indices,
+            excl_row_slices,
+            excl_col_slices,
+        )
+
+        logger.debug(
+            "Running tech mapping for chunks {} through {}".format(
+                gids[0], gids[-1]
+            )
+        )
         for i, _ in enumerate(gids):
             dist, ind = tree.query(coords_out[i])
             ind[(dist >= dist_thresh)] = -1
@@ -289,8 +320,14 @@ class TechMapping:
         return ind_out
 
     @staticmethod
-    def save_tech_map(excl_fpath, dset, indices, distance_threshold=None,
-                      res_fpath=None, chunks=(128, 128)):
+    def save_tech_map(
+        excl_fpath,
+        dset,
+        indices,
+        distance_threshold=None,
+        res_fpath=None,
+        chunks=(128, 128),
+    ):
         """Save tech mapping indices and coordinates to an h5 output file.
 
         Parameters
@@ -315,31 +352,40 @@ class TechMapping:
         shape = indices.shape
         chunks = (np.min((shape[0], chunks[0])), np.min((shape[1], chunks[1])))
 
-        with h5py.File(excl_fpath, 'a') as f:
+        with h5py.File(excl_fpath, "a") as f:
             if dset in list(f):
-                wmsg = ('TechMap results dataset "{}" is being replaced '
-                        'in pre-existing Exclusions TechMapping file "{}"'
-                        .format(dset, excl_fpath))
+                wmsg = (
+                    'TechMap results dataset "{}" is being replaced '
+                    'in pre-existing Exclusions TechMapping file "{}"'.format(
+                        dset, excl_fpath
+                    )
+                )
                 logger.warning(wmsg)
                 warn(wmsg, FileInputWarning)
                 f[dset][...] = indices
             else:
-                f.create_dataset(dset, shape=shape, dtype=indices.dtype,
-                                 data=indices, chunks=chunks)
+                f.create_dataset(
+                    dset,
+                    shape=shape,
+                    dtype=indices.dtype,
+                    data=indices,
+                    chunks=chunks,
+                )
 
             if distance_threshold:
-                f[dset].attrs['distance_threshold'] = distance_threshold
+                f[dset].attrs["distance_threshold"] = distance_threshold
 
             if res_fpath:
-                f[dset].attrs['src_res_fpath'] = res_fpath
+                f[dset].attrs["src_res_fpath"] = res_fpath
 
-        logger.info('Successfully saved tech map "{}" to {}'
-                    .format(dset, excl_fpath))
+        logger.info(
+            'Successfully saved tech map "{}" to {}'.format(dset, excl_fpath)
+        )
 
     def _check_fout(self):
         """Check the TechMapping output file for cached data."""
         with h5py.File(self._excl_fpath, 'r') as f:
-            if 'latitude' not in f or 'longitude' not in f:
+            if LATITUDE not in f or LONGITUDE not in f:
                 emsg = ('Datasets "latitude" and/or "longitude" not in '
                         'pre-existing Exclusions TechMapping file "{}". '
                         'Cannot proceed.'
@@ -370,33 +416,36 @@ class TechMapping:
         gid_chunks = np.array_split(self._gids, gid_chunks)
 
         # init full output arrays
-        indices = -1 * np.ones((self._n_excl, ), dtype=np.int32)
+        indices = -1 * np.ones((self._n_excl,), dtype=np.int32)
         iarr = self._make_excl_iarr(self._excl_shape)
 
         futures = {}
-        loggers = [__name__, 'reV']
-        with SpawnProcessPool(max_workers=max_workers,
-                              loggers=loggers) as exe:
-
+        loggers = [__name__, "reV"]
+        with SpawnProcessPool(max_workers=max_workers, loggers=loggers) as exe:
             # iterate through split executions, submitting each to worker
             for i, gid_set in enumerate(gid_chunks):
                 # submit executions and append to futures list
-                futures[exe.submit(self.map_resource_gids,
-                                   gid_set,
-                                   self._excl_fpath,
-                                   self._sc_row_indices,
-                                   self._sc_col_indices,
-                                   self._excl_row_slices,
-                                   self._excl_col_slices,
-                                   self._tree,
-                                   self.distance_threshold)] = i
+                futures[
+                    exe.submit(
+                        self.map_resource_gids,
+                        gid_set,
+                        self._excl_fpath,
+                        self._sc_row_indices,
+                        self._sc_col_indices,
+                        self._excl_row_slices,
+                        self._excl_col_slices,
+                        self._tree,
+                        self.distance_threshold,
+                    )
+                ] = i
 
             n_finished = 0
             for future in as_completed(futures):
                 n_finished += 1
-                logger.info('Parallel TechMapping futures collected: '
-                            '{} out of {}'
-                            .format(n_finished, len(futures)))
+                logger.info(
+                    "Parallel TechMapping futures collected: "
+                    "{} out of {}".format(n_finished, len(futures))
+                )
 
                 i = futures[future]
                 result = future.result()
@@ -407,7 +456,8 @@ class TechMapping:
                         self._sc_row_indices,
                         self._sc_col_indices,
                         self._excl_row_slices,
-                        self._excl_col_slices)
+                        self._excl_col_slices,
+                    )
                     ind_slice = iarr[row_slice, col_slice].flatten()
                     indices[ind_slice] = result[j]
 
@@ -416,8 +466,16 @@ class TechMapping:
         return indices
 
     @classmethod
-    def run(cls, excl_fpath, res_fpath, dset=None, sc_resolution=2560,
-            dist_margin=1.05, max_workers=None, points_per_worker=10):
+    def run(
+        cls,
+        excl_fpath,
+        res_fpath,
+        dset=None,
+        sc_resolution=2560,
+        dist_margin=1.05,
+        max_workers=None,
+        points_per_worker=10,
+    ):
         """Run parallel mapping and save to h5 file.
 
         Parameters
@@ -450,15 +508,19 @@ class TechMapping:
             Index values of the NN resource point. -1 if no res point found.
             2D integer array with shape equal to the exclusions extent shape.
         """
-        kwargs = {"dist_margin": dist_margin,
-                  "sc_resolution": sc_resolution}
+        kwargs = {"dist_margin": dist_margin, "sc_resolution": sc_resolution}
         mapper = cls(excl_fpath, res_fpath, **kwargs)
-        indices = mapper.map_resource(max_workers=max_workers,
-                                      points_per_worker=points_per_worker)
+        indices = mapper.map_resource(
+            max_workers=max_workers, points_per_worker=points_per_worker
+        )
 
         if dset:
-            mapper.save_tech_map(excl_fpath, dset, indices,
-                                 distance_threshold=mapper.distance_threshold,
-                                 res_fpath=res_fpath)
+            mapper.save_tech_map(
+                excl_fpath,
+                dset,
+                indices,
+                distance_threshold=mapper.distance_threshold,
+                res_fpath=res_fpath,
+            )
 
         return indices

reV/utilities/__init__.py

@@ -1,13 +1,271 @@
 # -*- coding: utf-8 -*-
-"""
-reV utilities.
-"""
+"""reV utilities."""
 from enum import Enum
+
 import PySAM
 from rex.utilities.loggers import log_versions as rex_log_versions
+
 from reV.version import __version__
 
 
+class FieldEnum(str, Enum):
+    """Base Field enum with some mapping methods."""
+
+    @classmethod
+    def map_to(cls, other):
+        """Return a rename map from this enum to another.
+
+        Mapping is performed on matching enum names. In other words, if
+        both enums have a `ONE` attribute, this will be mapped from one
+        enum to another.
+
+        Parameters
+        ----------
+        other : :class:`Enum`
+            ``Enum`` subclass with ``__members__`` attribute.
+
+        Returns
+        -------
+        dict
+            Dictionary mapping matching values from one enum to another.
+
+        Examples
+        --------
+        >>> class Test1(FieldEnum):
+        >>>     ONE = "one_x"
+        >>>     TWO = "two"
+        >>>
+        >>> class Test2(Enum):
+        >>>     ONE = "one_y"
+        >>>     THREE = "three"
+        >>>
+        >>> Test1.map_to(Test2)
+        {<Test1.ONE: 'one_x'>: <Test2.ONE: 'one_y'>}
+        """
+        return {
+            cls[mem]: other[mem]
+            for mem in cls.__members__
+            if mem in other.__members__
+        }
+
+    @classmethod
+    def map_from(cls, other):
+        """Map from a dictionary of name / member pairs to this enum.
+
+        Parameters
+        ----------
+        other : dict
+            Dictionary mapping key values (typically old aliases) to
+            enum values. For example, ``{'sc_gid': 'SC_GID'}`` would
+            return a dictionary that maps ``'sc_gid'`` to the ``SC_GID``
+            member of this enum.
+
+        Returns
+        -------
+        dict
+            Mapping of input dictionary keys to member values of this
+            enum.
+
+        Examples
+        --------
+        >>> class Test(FieldEnum):
+        >>>     ONE = "one_x"
+        >>>     TWO = "two_y"
+        >>>
+        >>> Test.map_from({1: "ONE", 2: "TWO"})
+        {1: <Test.ONE: 'one_x'>, 2: <Test.TWO: 'two_y'>}
+        """
+        return {name: cls[mem] for name, mem in other.items()}
+
+    def __str__(self):
+        return self.value
+
+    def __format__(self, format_spec):
+        return str.__format__(self.value, format_spec)
+
+
+class SiteDataField(FieldEnum):
+    """An enumerated map to site data column names."""
+
+    GID = "gid"
+    CONFIG = "config"
+
+
+class ResourceMetaField(FieldEnum):
+    """An enumerated map to resource meta column names.
+
+    Each output name should match the name of a key the resource file
+    meta table.
+    """
+
+    GID = "gid"
+    LATITUDE = "latitude"
+    LONGITUDE = "longitude"
+    ELEVATION = "elevation"
+    TIMEZONE = "timezone"
+    COUNTY = "county"
+    STATE = "state"
+    COUNTRY = "country"
+    OFFSHORE = "offshore"
+
+
+class SupplyCurveField(FieldEnum):
+    """An enumerated map to supply curve summary/meta keys.
+
+    This is a collection of known supply curve fields that reV outputs
+    across aggregation, supply curve, and bespoke outputs.
+
+    Not all of these columns are guaranteed in every supply-curve like
+    output (e.g. "convex_hull_area" is a bespoke-only output).
+    """
+
+    SC_GID = "sc_gid"
+    LATITUDE = "latitude"
+    LONGITUDE = "longitude"
+    COUNTRY = "country"
+    STATE = "state"
+    COUNTY = "county"
+    ELEVATION = "elevation_m"
+    TIMEZONE = "timezone"
+    SC_POINT_GID = "sc_point_gid"
+    SC_ROW_IND = "sc_row_ind"
+    SC_COL_IND = "sc_col_ind"
+    SOURCE_GIDS = "source_gids"
+    RES_GIDS = "res_gids"
+    GEN_GIDS = "gen_gids"
+    GID_COUNTS = "gid_counts"
+    N_GIDS = "n_gids"
+    MEAN_RES = "resource"
+    MEAN_CF_AC = "capacity_factor_ac"
+    MEAN_CF_DC = "capacity_factor_dc"
+    MEAN_LCOE = "lcoe_site_usd_per_mwh"
+    CAPACITY_AC_MW = "capacity_ac_mw"
+    CAPACITY_DC_MW = "capacity_dc_mw"
+    OFFSHORE = "offshore"
+    AREA_SQ_KM = "area_developable_sq_km"
+    MEAN_FRICTION = "friction_site"
+    MEAN_LCOE_FRICTION = "lcoe_friction_usd_per_mwh"
+    RAW_LCOE = "lcoe_raw_usd_per_mwh"
+    EOS_MULT = "multiplier_cc_eos"
+    REG_MULT = "multiplier_cc_regional"
+    SC_POINT_ANNUAL_ENERGY_MW = "annual_energy_site_mwh"
+    COST_BASE_OCC_USD_PER_AC_MW = "cost_base_occ_usd_per_ac_mw"
+    COST_SITE_OCC_USD_PER_AC_MW = "cost_site_occ_usd_per_ac_mw"
+    COST_BASE_FOC_USD_PER_AC_MW = "cost_base_foc_usd_per_ac_mw"
+    COST_SITE_FOC_USD_PER_AC_MW = "cost_site_foc_usd_per_ac_mw"
+    COST_BASE_VOC_USD_PER_AC_MW = "cost_base_voc_usd_per_ac_mw"
+    COST_SITE_VOC_USD_PER_AC_MW = "cost_site_voc_usd_per_ac_mw"
+    FIXED_CHARGE_RATE = "fixed_charge_rate"
+
+    # Bespoke outputs
+    POSSIBLE_X_COORDS = "possible_x_coords"
+    POSSIBLE_Y_COORDS = "possible_y_coords"
+    TURBINE_X_COORDS = "turbine_x_coords"
+    TURBINE_Y_COORDS = "turbine_y_coords"
+    N_TURBINES = "n_turbines"
+    INCLUDED_AREA = "area_included_sq_km"
+    INCLUDED_AREA_CAPACITY_DENSITY = (
+        "capacity_density_included_area_mw_per_km2"
+    )
+    CONVEX_HULL_AREA = "area_convex_hull_sq_km"
+    CONVEX_HULL_CAPACITY_DENSITY = "capacity_density_convex_hull_mw_per_km2"
+    FULL_CELL_CAPACITY_DENSITY = "capacity_density_full_cell_mw_per_km2"
+    BESPOKE_AEP = "optimized_plant_aep"
+    BESPOKE_OBJECTIVE = "optimized_plant_objective"
+    BESPOKE_CAPITAL_COST = "optimized_plant_capital_cost"
+    BESPOKE_FIXED_OPERATING_COST = "optimized_plant_fixed_operating_cost"
+    BESPOKE_VARIABLE_OPERATING_COST = "optimized_plant_variable_operating_cost"
+    BESPOKE_BALANCE_OF_SYSTEM_COST = "optimized_plant_balance_of_system_cost"
+
+    # Transmission outputs
+    TRANS_GID = "trans_gid"
+    TRANS_TYPE = "trans_type"
+    TOTAL_LCOE_FRICTION = "lcoe_total_friction_usd_per_mwh"
+    TRANS_CAPACITY = "trans_capacity"
+    DIST_SPUR_KM = "dist_spur_km"
+    DIST_EXPORT_KM = "dist_export_km"
+    REINFORCEMENT_DIST_KM = "dist_reinforcement_km"
+    TIE_LINE_COST_PER_MW = "cost_spur_usd_per_mw"
+    CONNECTION_COST_PER_MW = "cost_poi_usd_per_mw"
+    EXPORT_COST_PER_MW = "cost_export_usd_per_mw"
+    REINFORCEMENT_COST_PER_MW = "cost_reinforcement_usd_per_mw"
+    TOTAL_TRANS_CAP_COST_PER_MW = "cost_total_trans_usd_per_mw"
+    LCOT = "lcot_usd_per_mwh"
+    TOTAL_LCOE = "lcoe_all_in_usd_per_mwh"
+    N_PARALLEL_TRANS = "count_num_parallel_trans"
+    POI_LAT = "latitude_poi"
+    POI_LON = "longitude_poi"
+    REINFORCEMENT_POI_LAT = "latitude_reinforcement_poi"
+    REINFORCEMENT_POI_LON = "longitude_reinforcement_poi"
+
+    @classmethod
+    def map_from_legacy(cls):
+        """Map of legacy names to current values.
+
+        Returns
+        -------
+        dict
+            Dictionary that maps legacy supply curve column names to
+            members of this enum.
+        """
+        legacy_map = {}
+        for current_field, old_field in cls.map_to(_LegacySCAliases).items():
+            aliases = old_field.value
+            if isinstance(aliases, str):
+                aliases = [aliases]
+            legacy_map.update({alias: current_field for alias in aliases})
+
+        return legacy_map
+
+
+class _LegacySCAliases(Enum):
+    """Legacy supply curve column names.
+
+    Enum values can be either a single string or an iterable of string
+    values where each string value represents a previously known alias.
+    """
+
+    ELEVATION = "elevation"
+    MEAN_RES = "mean_res"
+    MEAN_CF_AC = "mean_cf"
+    MEAN_LCOE = "mean_lcoe"
+    CAPACITY_AC_MW = "capacity"
+    AREA_SQ_KM = "area_sq_km"
+    MEAN_FRICTION = "mean_friction"
+    MEAN_LCOE_FRICTION = "mean_lcoe_friction"
+    RAW_LCOE = "raw_lcoe"
+    TRANS_TYPE = "category"
+    TRANS_CAPACITY = "avail_cap"
+    DIST_SPUR_KM = "dist_km"
+    REINFORCEMENT_DIST_KM = "reinforcement_dist_km"
+    TIE_LINE_COST_PER_MW = "tie_line_cost_per_mw"
+    CONNECTION_COST_PER_MW = "connection_cost_per_mw"
+    REINFORCEMENT_COST_PER_MW = "reinforcement_cost_per_mw"
+    TOTAL_TRANS_CAP_COST_PER_MW = "trans_cap_cost_per_mw"
+    LCOT = "lcot"
+    TOTAL_LCOE = "total_lcoe"
+    TOTAL_LCOE_FRICTION = "total_lcoe_friction"
+    N_PARALLEL_TRANS = "n_parallel_trans"
+    EOS_MULT = "eos_mult", "capital_cost_multiplier"
+    REG_MULT = "reg_mult"
+    SC_POINT_ANNUAL_ENERGY_MW = "sc_point_annual_energy"
+    POI_LAT = "poi_lat"
+    POI_LON = "poi_lon"
+    REINFORCEMENT_POI_LAT = "reinforcement_poi_lat"
+    REINFORCEMENT_POI_LON = "reinforcement_poi_lon"
+    BESPOKE_AEP = "bespoke_aep"
+    BESPOKE_OBJECTIVE = "bespoke_objective"
+    BESPOKE_CAPITAL_COST = "bespoke_capital_cost"
+    BESPOKE_FIXED_OPERATING_COST = "bespoke_fixed_operating_cost"
+    BESPOKE_VARIABLE_OPERATING_COST = "bespoke_variable_operating_cost"
+    BESPOKE_BALANCE_OF_SYSTEM_COST = "bespoke_balance_of_system_cost"
+    INCLUDED_AREA = "included_area"
+    INCLUDED_AREA_CAPACITY_DENSITY = "included_area_capacity_density"
+    CONVEX_HULL_AREA = "convex_hull_area"
+    CONVEX_HULL_CAPACITY_DENSITY = "convex_hull_capacity_density"
+    FULL_CELL_CAPACITY_DENSITY = "full_cell_capacity_density"
+
+
 class ModuleName(str, Enum):
     """A collection of the module names available in reV.
 
@@ -22,17 +280,17 @@ class ModuleName(str, Enum):
     click name conversions: https://tinyurl.com/4rehbsvf
     """
 
-    BESPOKE = 'bespoke'
-    COLLECT = 'collect'
-    ECON = 'econ'
-    GENERATION = 'generation'
-    HYBRIDS = 'hybrids'
-    MULTI_YEAR = 'multi-year'
-    NRWAL = 'nrwal'
-    QA_QC = 'qa-qc'
-    REP_PROFILES = 'rep-profiles'
-    SUPPLY_CURVE = 'supply-curve'
-    SUPPLY_CURVE_AGGREGATION = 'supply-curve-aggregation'
+    BESPOKE = "bespoke"
+    COLLECT = "collect"
+    ECON = "econ"
+    GENERATION = "generation"
+    HYBRIDS = "hybrids"
+    MULTI_YEAR = "multi-year"
+    NRWAL = "nrwal"
+    QA_QC = "qa-qc"
+    REP_PROFILES = "rep-profiles"
+    SUPPLY_CURVE = "supply-curve"
+    SUPPLY_CURVE_AGGREGATION = "supply-curve-aggregation"
 
     def __str__(self):
         return self.value
@@ -63,6 +321,6 @@ def log_versions(logger):
     logger : logging.Logger
         Logger object to log memory message to.
     """
-    logger.info('Running with reV version {}'.format(__version__))
+    logger.info("Running with reV version {}".format(__version__))
     rex_log_versions(logger)
-    logger.debug('- PySAM version {}'.format(PySAM.__version__))
+    logger.debug("- PySAM version {}".format(PySAM.__version__))