NREL-reV 0.9.7__py3-none-any.whl → 0.12.2__py3-none-any.whl

reV/bespoke/place_turbines.py

@@ -49,8 +49,7 @@ class PlaceTurbines:
                  fixed_operating_cost_function,
                  variable_operating_cost_function,
                  balance_of_system_cost_function,
-                 include_mask, pixel_side_length, min_spacing,
-                 wake_loss_multiplier=1):
+                 include_mask, pixel_side_length, min_spacing):
         """
         Parameters
         ----------
@@ -118,12 +117,6 @@ class PlaceTurbines:
             Side length (m) of a single pixel of the `include_mask`.
         min_spacing : float
             The minimum spacing between turbines (in meters).
-        wake_loss_multiplier : float, optional
-            A multiplier used to scale the annual energy lost due to
-            wake losses. **IMPORTANT**: This multiplier will ONLY be
-            applied during the optimization process and will NOT be
-            come through in output values such as aep, any of the cost
-            functions, or even the output objective.
         """
 
         # inputs
@@ -139,7 +132,6 @@ class PlaceTurbines:
         self.include_mask = include_mask
         self.pixel_side_length = pixel_side_length
         self.min_spacing = min_spacing
-        self.wake_loss_multiplier = wake_loss_multiplier
 
         # internal variables
         self.nrows, self.ncols = np.shape(include_mask)
@@ -269,7 +261,7 @@ class PlaceTurbines:
 
             self.wind_plant.assign_inputs()
             self.wind_plant.execute()
-            aep = self._aep_after_scaled_wake_losses()
+            aep = self.wind_plant['annual_energy']
             avg_sl_dist_to_center_m = self._avg_sl_dist_to_cent(x_locs, y_locs)
             avg_sl_dist_to_medoid_m = self._avg_sl_dist_to_med(x_locs, y_locs)
             if "nn_conn_dist_m" in self.balance_of_system_cost_function:
@@ -301,21 +293,6 @@ class PlaceTurbines:
 
         return objective
 
-    def _aep_after_scaled_wake_losses(self):
-        """AEP after scaling the energy lost due to wake."""
-        wake_loss_pct = self.wind_plant['wake_losses']
-        aep = self.wind_plant['annual_energy']
-        agep = self.wind_plant['annual_gross_energy']
-
-        energy_lost_due_to_wake = wake_loss_pct / 100 * agep
-        aep_after_wake_losses = agep - energy_lost_due_to_wake
-        other_losses_multiplier = 1 - aep / aep_after_wake_losses
-
-        scaled_wake_losses = (self.wake_loss_multiplier
-                              * energy_lost_due_to_wake)
-        aep_after_scaled_wake_losses = max(0, agep - scaled_wake_losses)
-        return aep_after_scaled_wake_losses * (1 - other_losses_multiplier)
-
     def optimize(self, **kwargs):
         """Optimize wind farm layout.
 

reV/config/output_request.py

@@ -101,5 +101,14 @@ class SAMOutputRequest(OutputRequest):
                    'dc_power': 'dc',
                    'clipping': 'clipped_power',
                    'clipped': 'clipped_power',
-                   'clip': 'clipped_power'
+                   'clip': 'clipped_power',
+                   'capacity': 'system_capacity',
+                   'wd': 'winddirection',
+                   'wind_direction': 'winddirection',
+                   'wind-direction': 'winddirection',
+                   'wl': 'annual_wake_loss_internal_percent',
+                   'wl_kwh': 'annual_wake_loss_internal_kWh',
+                   'wl_pct': 'annual_wake_loss_total_percent',
+                   'wl_ts': 'wake_loss_internal_percent',
+                   'wl_kwh': 'wake_loss_internal_kW',
                    }

reV/config/project_points.py

@@ -24,6 +24,7 @@ from reV.utilities import SiteDataField, SupplyCurveField
 from reV.utilities.exceptions import ConfigError, ConfigWarning
 
 logger = logging.getLogger(__name__)
+_DEFAULT_CURTAIL_KEY = "default"
 
 
 class PointsControl:
@@ -246,7 +247,7 @@ class ProjectPoints:
             pre loaded SAMConfig object.
         tech : str, optional
             SAM technology to analyze (pvwattsv7, windpower, tcsmoltensalt,
-            solarwaterheat, troughphysicalheat, lineardirectsteam)
+            solarwaterheat, lineardirectsteam, geothermal)
             The string should be lower-cased with spaces and _ removed,
             by default None
         res_file : str | NoneType
@@ -269,6 +270,7 @@ class ProjectPoints:
         self._tech = str(tech)
         self._h = self._d = None
         self._curtailment = self._parse_curtailment(curtailment)
+        self._check_points_curtailment_mapping()
 
     def __getitem__(self, site):
         """Get the SAM config ID and dictionary for the requested site.
@@ -444,7 +446,7 @@ class ProjectPoints:
         -------
         _tech : str
             SAM technology to analyze (pvwattsv7, windpower, tcsmoltensalt,
-            solarwaterheat, troughphysicalheat, lineardirectsteam)
+            solarwaterheat, lineardirectsteam, geothermal)
             The string should be lower-cased with spaces and _ removed.
         """
         return "windpower" if "wind" in self._tech.lower() else self._tech
@@ -532,10 +534,9 @@ class ProjectPoints:
 
         Parameters
         ----------
-        points : int | str | pd.DataFrame | slice | list
-            Slice specifying project points, string pointing to a project
-            points csv, or a dataframe containing the effective csv contents.
-            Can also be a single integer site value.
+        points : int | str | slice | list
+            Slice specifying project points, string pointing to a
+            project points csv. Can also be a single integer site value.
         res_file : str | NoneType
             Optional resource file to find maximum length of project points if
             points slice stop is None.
@@ -625,6 +626,10 @@ class ProjectPoints:
         if SiteDataField.CONFIG not in df.columns:
             df[SiteDataField.CONFIG] = None
 
+        # pylint: disable=no-member
+        if SiteDataField.CURTAILMENT not in df.columns:
+            df[SiteDataField.CURTAILMENT] = None
+
         gids = df[SiteDataField.GID].values
         if not np.array_equal(np.sort(gids), gids):
             msg = (
@@ -687,18 +692,29 @@ class ProjectPoints:
 
         Returns
         -------
-        curtailments : NoneType | reV.config.curtailment.Curtailment
-            None if no curtailment, reV curtailment config object if
-            curtailment is being assessed.
+        curtailments : NoneType | dict
+            None if no curtailment, dictionary of reV curtailment config
+            objects if curtailment is being assessed.
         """
-        if isinstance(curtailment_input, (str, dict)):
-            # pointer to config file or explicit input namespace,
-            # instantiate curtailment config object
-            curtailment = Curtailment(curtailment_input)
-
-        elif isinstance(curtailment_input, (Curtailment, type(None))):
-            # pre-initialized curtailment object or no curtailment (None)
-            curtailment = curtailment_input
+        if curtailment_input is None:
+            return None
+
+        if isinstance(curtailment_input, str):
+            # pointer to config file - instantiate curtailment config
+            # object under default key
+            curtailment = {
+                _DEFAULT_CURTAIL_KEY: Curtailment(curtailment_input)}
+
+        elif isinstance(curtailment_input, dict):
+            # pointer to dict of configs - instantiate all
+            # curtailment config objects
+            curtailment = {k: Curtailment(v)
+                           for k, v in curtailment_input.items()}
+
+        elif isinstance(curtailment_input, Curtailment):
+            # pre-initialized curtailment object - instantiate
+            # curtailment config object under default key
+            curtailment = {_DEFAULT_CURTAIL_KEY: curtailment_input}
 
         else:
             curtailment = None
@@ -790,6 +806,75 @@ class ProjectPoints:
             logger.error(msg)
             raise ConfigError(msg)
 
+    def _check_points_curtailment_mapping(self):
+        """
+        Check to ensure the project points (df) and curtailment configs
+        are compatible. Update as necessary or break
+        """
+        if not self.curtailment:
+            return
+
+        # Extract unique config references from project_points DataFrame
+        df_configs = self.df[SiteDataField.CURTAILMENT].unique()
+        curtail_configs = self.curtailment
+
+        can_fill_null = (len(df_configs) == 1
+                         and df_configs[0] is None
+                         and len(curtail_configs) == 1)
+        if can_fill_null:
+            self._df[SiteDataField.CURTAILMENT] = list(curtail_configs)[0]
+            df_configs = self.df[SiteDataField.CURTAILMENT].unique()
+
+        # Checks to make sure that the same number of curtailment config
+        # files as references in project_points DataFrame
+        if len(set(df_configs) - {None}) > len(curtail_configs):
+            msg = (
+                "Points references {} curtailment configs while only "
+                "{} curtailment configs were provided!".format(
+                    len(df_configs), len(curtail_configs)
+                )
+            )
+            logger.error(msg)
+            raise ConfigError(msg)
+
+
+        unused_configs = set(curtail_configs) - set(df_configs)
+        if unused_configs:
+            msg = ("One or more curtailment configurations not found in "
+                   "project points and are thus ignored: {}"
+                   .format(unused_configs))
+            logger.warning(msg)
+            warn(msg, UserWarning)
+
+        # Check to see if config references in project_points DataFrame
+        # are valid file paths, if compare with curtailment configs
+        # and update as needed
+        configs = {}
+        for config in df_configs:
+            if config is None:
+                continue
+            if os.path.isfile(config):
+                configs[config] = config
+            elif config in curtail_configs:
+                configs[config] = curtail_configs[config]
+            else:
+                msg = ("Curtailment {} does not map to a valid "
+                       "configuration file".format(config))
+                logger.error(msg)
+                raise ConfigError(msg)
+
+        # If configs has any keys that are not in curtailment configs then
+        # something really weird happened so raise an error.
+        if any(set(configs) - set(curtail_configs)):
+            msg = (
+                "A wild config has appeared! Requested config keys for "
+                "ProjectPoints are {} and previous config keys are {}".format(
+                    list(configs), list(curtail_configs)
+                )
+            )
+            logger.error(msg)
+            raise ConfigError(msg)
+
     def join_df(self, df2, key=SiteDataField.GID):
         """Join new df2 to the _df attribute using the _df's gid as pkey.
 
@@ -840,6 +925,28 @@ class ProjectPoints:
 
         return list(sites)
 
+    def get_sites_from_curtailment(self, curtailment):
+        """Get a site list that corresponds to a curtailment key.
+
+        Parameters
+        ----------
+        curtailment : str
+            Curtailment configuration ID associated with sites.
+
+        Returns
+        -------
+        sites : list
+            List of sites associated with the requested curtailment ID.
+            If the curtailment ID is not recognized, an empty list is
+            returned.
+        """
+        sites = self.df.loc[
+            (self.df[SiteDataField.CURTAILMENT] == curtailment),
+            SiteDataField.GID
+        ].values
+
+        return list(sites)
+
     @classmethod
     def split(cls, i0, i1, project_points):
         """Return split instance of a ProjectPoints instance w/ site subset.
@@ -936,7 +1043,7 @@ class ProjectPoints:
             pre loaded SAMConfig object.
         tech : str, optional
             SAM technology to analyze (pvwattsv7, windpower, tcsmoltensalt,
-            solarwaterheat, troughphysicalheat, lineardirectsteam)
+            solarwaterheat, lineardirectsteam, geothermal)
             The string should be lower-cased with spaces and _ removed,
             by default None
         curtailment : NoneType | dict | str | config.curtailment.Curtailment
@@ -1035,7 +1142,7 @@ class ProjectPoints:
             pre loaded SAMConfig object.
         tech : str, optional
             SAM technology to analyze (pvwattsv7, windpower, tcsmoltensalt,
-            solarwaterheat, troughphysicalheat, lineardirectsteam)
+            solarwaterheat, lineardirectsteam, geothermal)
             The string should be lower-cased with spaces and _ removed,
             by default None
         curtailment : NoneType | dict | str | config.curtailment.Curtailment

reV/generation/base.py

@@ -368,7 +368,7 @@ class BaseGen(ABC):
         -------
         tech : str
             SAM technology to analyze (pvwattsv7, windpower, tcsmoltensalt,
-            solarwaterheat, troughphysicalheat, lineardirectsteam, econ)
+            solarwaterheat, lineardirectsteam, geothermal, econ)
             The string should be lower-cased with spaces and _ removed.
         """
         return self.project_points.tech
@@ -540,7 +540,7 @@ class BaseGen(ABC):
             pre loaded SAMConfig object.
         tech : str
             SAM technology to analyze (pvwattsv7, windpower, tcsmoltensalt,
-            solarwaterheat, troughphysicalheat, lineardirectsteam)
+            solarwaterheat, lineardirectsteam, geothermal)
             The string should be lower-cased with spaces and _ removed.
         sites_per_worker : int
             Number of sites to run in series on a worker. None defaults to the
@@ -622,7 +622,7 @@ class BaseGen(ABC):
             pre loaded SAMConfig object.
         tech : str
             SAM technology to analyze (pvwattsv7, windpower, tcsmoltensalt,
-            solarwaterheat, troughphysicalheat, lineardirectsteam)
+            solarwaterheat, lineardirectsteam, geothermal)
             The string should be lower-cased with spaces and _ removed.
         sites_per_worker : int
             Number of sites to run in series on a worker. None defaults to the
@@ -783,7 +783,7 @@ class BaseGen(ABC):
             A PointsControl instance dictating what sites and configs are run.
         tech : str
             SAM technology to analyze (pvwattsv7, windpower, tcsmoltensalt,
-            solarwaterheat, troughphysicalheat, lineardirectsteam)
+            solarwaterheat, lineardirectsteam, geothermal)
             The string should be lower-cased with spaces and _ removed.
         res_file : str
             Filepath to single resource file, multi-h5 directory,
@@ -1147,11 +1147,29 @@ class BaseGen(ABC):
                 if not isinstance(value, np.ndarray):
                     value = np.array(value)
 
+                value = self._patch_wave_gen_pysam_5(var, value)
                 self._out[var][:, i] = value.T
 
             elif value != 0:
                 self._out[var][i] = value
 
+    def _patch_wave_gen_pysam_5(self, var, value):
+        """Patch the "gen" output of wave generation for PySAm 5+
+
+        As of PySAM 5+, the "gen" array is of shape 8760, but only the
+        first 2920 entires are populated.
+        See this line: https://github.com/NREL/ssc/blob/2098300044a9be7745c2b93b911adb2d9dc3c282/ssc/cmod_mhk_wave.cpp#L687
+        """
+        if self.tech.casefold() != "mhkwave":
+            return value
+        if var.casefold() not in ("gen", "cf_profile", "gen_profile"):
+            return value
+
+        if any(value[2920:]):
+            msg = "Found non-zero values at end of gen array!"
+            raise ValueError(msg)
+        return value[:2920]
+
     def site_index(self, site_gid, out_index=False):
         """Get the index corresponding to the site gid.
 

reV/generation/generation.py

@@ -27,7 +27,6 @@ from reV.SAM.generation import (
     PvWattsv8,
     SolarWaterHeat,
     TcsMoltenSalt,
-    TroughPhysicalHeat,
     WindPower,
 )
 from reV.utilities import ModuleName, ResourceMetaField, SupplyCurveField
@@ -68,7 +67,6 @@ class Gen(BaseGen):
         "pvwattsv8": PvWattsv8,
         "solarwaterheat": SolarWaterHeat,
         "tcsmoltensalt": TcsMoltenSalt,
-        "troughphysicalheat": TroughPhysicalHeat,
         "windpower": WindPower,
     }
 
@@ -175,12 +173,20 @@ class Gen(BaseGen):
 
                 - ``gid``: Integer specifying the generation GID of each
                   site.
-                - ``config``: Key in the `sam_files` input dictionary
+                - ``config``: This is an *optional* column that contains
+                  a key from the `sam_files` input dictionary
                   (see below) corresponding to the SAM configuration to
                   use for each particular site. This value can also be
-                  ``None`` (or left out completely) if you specify only
-                  a single SAM configuration file as the `sam_files`
-                  input.
+                  ``None``, ``"default"``, or left out completely if you
+                  specify only a single SAM configuration file as the
+                  `sam_files` input.
+                - ``curtailment``: This is an *optional* column that
+                  contains a key from the `curtailment` input dictionary
+                  (see below) corresponding to the curtailment to apply
+                  at that particular site. This value can also be
+                  ``None``, ``"default"``, or left out completely if you
+                  specify only a single curtailment configuration file
+                  as the `curtailment` input.
                 - ``capital_cost_multiplier``: This is an *optional*
                   multiplier input that, if included, will be used to
                   regionally scale the ``capital_cost`` input in the SAM
@@ -238,9 +244,9 @@ class Gen(BaseGen):
             Filepath to resource data. This input can be path to a
             single resource HDF5 file or a path including a wildcard
             input like ``/h5_dir/prefix*suffix`` (i.e. if your datasets
-            for a single year are spread out over multiple files). In
-            all cases, the resource data must be readable by
-            :py:class:`rex.resource.Resource`
+            like wind speed, wind direction, pressure, and so on are
+            spread out over multiple files). In all cases, the resource
+            data must be readable by :py:class:`rex.resource.Resource`
             or :py:class:`rex.multi_file_resource.MultiFileResource`.
             (i.e. the resource data conform to the
             `rex data format <https://tinyurl.com/3fy7v5kx>`_). This
@@ -254,13 +260,19 @@ class Gen(BaseGen):
 
             .. Note:: If executing ``reV`` from the command line, this
               input string can contain brackets ``{}`` that will be
-              filled in by the `analysis_years` input. Alternatively,
-              this input can be a list of explicit files to process. In
-              this case, the length of the list must match the length of
-              the `analysis_years` input exactly, and the path are
-              assumed to align with the `analysis_years` (i.e. the first
-              path corresponds to the first analysis year, the second
-              path corresponds to the second analysis year, and so on).
+              filled in by the `analysis_years` input. If your datasets
+              span multiple files (e.g. "wtk_wind_speed_2012.h5",
+              "wtk_pressure_2012.h5", "wtk_wind_direction_2012.h5"), you
+              may use a wildcard input along with brackets, like so:
+              ``"wtk_*_{}.h5"``. Alternatively, this input can be a list
+              of explicit files to process. In this case, the length of
+              the list must match the length of the `analysis_years`
+              input exactly, and the paths are assumed to align with the
+              `analysis_years` (i.e. the first path corresponds to the
+              first analysis year, the second path corresponds to the
+              second analysis year, and so on). Wild cards are allowed,
+              even if you list out the years explicitly (i.e.
+              ``["wtk_*_2012.h5", "wtk_*_2013.h5", ...]``)
 
             .. Important:: If you are using custom resource data (i.e.
               not NSRDB/WTK/Sup3rCC, etc.), ensure the following:
@@ -336,15 +348,26 @@ class Gen(BaseGen):
 
             By default, ``None``.
         curtailment : dict | str, optional
-            Inputs for curtailment parameters, which can be:
-
-                - Explicit namespace of curtailment variables (dict)
-                - Pointer to curtailment config file with path (str)
+            Input for curtailment parameters, which can be one of:
+
+                - Single string representing path to curtailment config
+                  file. In this case, the curtailment config is given
+                  the name "default" and applied everywhere (if the
+                  project points "curtailment" column is missing or all
+                  ``None``) or only where the project points
+                  "curtailment" column contains a value of "default"
+                - Dictionary mapping user-defined curtailment "names" to
+                  either A) strings (paths) or B) explicit namespaces of
+                  curtailment configurations (dicts). Mixing these two
+                  _is_ allowed.
 
             The allowed key-value input pairs in the curtailment
             configuration are documented as properties of the
             :class:`reV.config.curtailment.Curtailment` class. If
-            ``None``, no curtailment is modeled. By default, ``None``.
+            ``None``, no curtailment is modeled. You can select which
+            curtailment gets applied to which site using the
+            "curtailment" column key in the project points input.
+            By default, ``None``.
         gid_map : dict | str, optional
             Mapping of unique integer generation gids (keys) to single
             integer resource gids (values). This enables unique
@@ -650,7 +673,7 @@ class Gen(BaseGen):
             A PointsControl instance dictating what sites and configs are run.
         tech : str
             SAM technology to analyze (pvwattsv7, windpower, tcsmoltensalt,
-            solarwaterheat, troughphysicalheat, lineardirectsteam)
+            solarwaterheat, lineardirectsteam, geothermal)
             The string should be lower-cased with spaces and _ removed.
         res_file : str
             Filepath to single resource file, multi-h5 directory,

reV/generation/output_attributes/linear_fresnel.json

@@ -27,6 +27,13 @@
     "type": "array",
     "units": "kW"
   },
+  "gen_heat": {
+    "chunks": null,
+    "dtype": "float32",
+    "scale_factor": 1,
+    "type": "array",
+    "units": "kW"
+  },
   "m_dot_field": {
     "chunks": null,
     "dtype": "float32",

reV/losses/power_curve.py

@@ -722,6 +722,9 @@ class PowerCurveLossesMixin:
         if isinstance(power_curve_losses_info, str):
             power_curve_losses_info = json.loads(power_curve_losses_info)
 
+        logger.info("Applying power curve losses using the following input:"
+                    "\n{}".format(power_curve_losses_info))
+
         loss_input = PowerCurveLossesInput(power_curve_losses_info)
         if loss_input.target <= 0:
             logger.debug("Power curve target loss is 0. Skipping power curve "

reV/losses/scheduled.py

@@ -7,6 +7,7 @@ import warnings
 import json
 
 import numpy as np
+import PySAM
 
 from reV.losses.utils import (convert_to_full_month_names,
                               filter_unknown_month_names,
@@ -523,10 +524,10 @@ class ScheduledLossesMixin:
         information is expected to be a list of dictionaries containing
         outage specifications. See :class:`Outage` for a description of
         the specifications allowed for each outage. The scheduled losses
-        are passed to SAM via the ``hourly`` key to signify which hourly
-        capacity factors should be adjusted with outage losses. If no
-        outage info is specified in ``sam_sys_inputs``, no scheduled
-        losses are added.
+        are passed to SAM via the ``adjust_hourly`` key to signify which
+        hourly capacity factors should be adjusted with outage losses.
+        If no outage info is specified in ``sam_sys_inputs``, no
+        scheduled losses are added.
 
         Parameters
         ----------
@@ -542,13 +543,14 @@ class ScheduledLossesMixin:
 
         Notes
         -----
-        The scheduled losses are passed to SAM via the ``hourly`` key to
-        signify which hourly capacity factors should be adjusted with
-        outage losses. If the user specifies other hourly adjustment
-        factors via the ``hourly`` key, the effect is combined. For
-        example, if the user inputs a 33% hourly adjustment factor and
-        reV schedules an outage for 70% of the farm down for the same
-        hour, then the resulting adjustment factor is
+        The scheduled losses are passed to SAM via the ``adjust_hourly``
+        key to signify which hourly capacity factors should be adjusted
+        with outage losses. If the user specifies other hourly
+        adjustment factors via the ``adjust_hourly`` key, the effect is
+        combined. For example, if the user inputs a 33% hourly
+        adjustment factor and reV schedules an outage for 70% of the
+        farm down for the same hour, then the resulting adjustment
+        factor is
 
             .. math: 1 - [(1 - 70/100) * (1 - 33/100)] = 0.799
 
@@ -573,7 +575,7 @@ class ScheduledLossesMixin:
         self._add_outages_to_sam_inputs(hourly_outages)
 
         logger.debug("Hourly adjustment factors after scheduled outages: {}"
-                     .format(list(self.sam_sys_inputs['hourly'])))
+                     .format(list(self.sam_sys_inputs['adjust_hourly'])))
 
     def _user_outage_input(self):
         """Get outage and seed info from config. """
@@ -600,12 +602,15 @@ class ScheduledLossesMixin:
         """Add the hourly adjustment factors to config, checking user input."""
 
         hourly_mult = 1 - outages / 100
+        hourly_mult = self._fix_pysam_bug(hourly_mult)
 
-        user_hourly_input = self.sam_sys_inputs.pop('hourly', [0] * 8760)
+        user_hourly_input = self.sam_sys_inputs.pop('adjust_hourly',
+                                                    [0] * 8760)
         user_hourly_mult = 1 - np.array(user_hourly_input) / 100
 
         final_hourly_mult = hourly_mult * user_hourly_mult
-        self.sam_sys_inputs['hourly'] = (1 - final_hourly_mult) * 100
+        self.sam_sys_inputs['adjust_hourly'] = (1 - final_hourly_mult) * 100
+        self.sam_sys_inputs['adjust_en_hourly'] = 1
 
     @property
     def outage_seed(self):
@@ -626,3 +631,19 @@ class ScheduledLossesMixin:
             pass
 
         return self.__base_seed
+
+    def _fix_pysam_bug(self, hourly_mult):
+        """Fix PySAM bug that squares HAF user input"""
+        if getattr(self, "MODULE", "").casefold() != "windpower":
+            return hourly_mult
+
+        bugged_pysam_version = (PySAM.__version__.startswith("5")
+                                or PySAM.__version__.startswith("6"))
+        if not bugged_pysam_version:
+            return hourly_mult
+
+        # Bug in PySAM windpower module that applies HAF twice (i.e.
+        # squares the input values), so we sqrt the desired loss value
+        return np.sqrt(hourly_mult)
+
+

reV/supply_curve/aggregation.py

@@ -438,6 +438,53 @@ class BaseAggregation(ABC):
 
         return gid_inclusions
 
+    @staticmethod
+    def _get_gid_zones(excl_fpath, zones_dset, gid, slice_lookup):
+        """
+        Get zones 2D array for desired gid.
+
+        Parameters
+        ----------
+        excl_fpath : str | None, optional
+            Filepath to HDF5 file containing `zones_dset`. If not specified,
+            output of function will be an array containing all values equal to
+            1.
+        zones_dset : str | None, optional
+            Dataset name in the `excl_fpath` file containing the zones to be
+            loaded. If not specified, output of function will be an array
+            containing all values equal to 1.
+        gid : int
+            sc_point_gid value, used to extract the applicable subset of zones.
+        slice_lookup : dict
+            Mapping of sc_point_gids to exclusion/inclusion row and column
+            slices
+
+        Returns
+        -------
+        zones : ndarray | None
+            2D array of zones for desired gid.
+        """
+
+        row_slice, col_slice = slice_lookup[gid]
+        if excl_fpath is not None and zones_dset is not None:
+            with ExclusionLayers(excl_fpath) as fh:
+                if zones_dset not in fh:
+                    msg = (
+                        f"Could not find zones_dset {zones_dset} in "
+                        f"excl_fpath {excl_fpath}."
+                    )
+                    logger.error(msg)
+                    raise FileInputError(msg)
+                zones = fh[zones_dset, row_slice, col_slice]
+        else:
+            shape = (
+                row_slice.stop - row_slice.start,
+                col_slice.stop - col_slice.start
+            )
+            zones = np.ones(shape, dtype="uint8")
+
+        return zones
+
     @staticmethod
     def _parse_gen_index(gen_fpath):
         """Parse gen outputs for an array of generation gids corresponding to