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

reV/SAM/defaults/geothermal.json

@@ -1,18 +1,23 @@
 {
 	"ui_calculations_only" : 0,
 	"system_use_lifetime_output" : 0,
+	"geotherm_cost_inj_prod_well_ratio" : 0.75,
+	"drilling_success_rate" : 76,
+	"stim_success_rate" : 0,
+	"failed_prod_flow_ratio" : 0.29999999999999999,
 	"file_name" : "./USA AZ Phoenix Sky Harbor Intl Ap (TMY3).csv",
-	"resource_potential" : 210,
+    "resource_potential" : 210,
 	"resource_type" : 0,
 	"resource_temp" : 200,
 	"resource_depth" : 2000,
-	"geothermal_analysis_period" : 30,
+	"geothermal_analysis_period" : 25,
 	"model_choice" : 0,
+	"reservoir_model_inputs" : [ [ 0,  20,  100 ], [ 100, 85.664100000000005,  133.702 ], [ 200, 109.23099999999999,  145.774 ], [ 300, 125.79300000000001,  153.17599999999999 ], [ 400, 138.49600000000001,  158.363 ], [ 500, 148.65600000000001,  162.25800000000001 ], [ 600, 157.00999999999999,  165.316 ], [ 700, 164.02000000000001,  167.79599999999999 ], [ 800, 169.999,  169.857 ], [ 900, 175.16200000000001,  171.595 ], [ 1000, 179.67699999999999,  173.08799999999999 ], [ 2000, 202.05699999999999,  179.34100000000001 ], [ 3000, 214.012,  182.249 ], [ 4000, 221.00299999999999,  183.48400000000001 ], [ 5000, 225.393,  183.88499999999999 ], [ 6000, 228.25200000000001,  183.83000000000001 ], [ 7000, 230.15799999999999,  183.52000000000001 ], [ 8000, 231.42699999999999,  183.06100000000001 ], [ 9000, 232.273,  182.523 ], [ 10000, 232.804,  181.935 ], [ 11611, 233.00700000000001,  180.864 ], [ 13481, 232.952,  179.68700000000001 ], [ 15653, 232.61600000000001,  178.40199999999999 ], [ 18174, 232.018,  177.02500000000001 ], [ 21101, 231.18899999999999,  175.57599999999999 ], [ 24501, 230.154,  174.06899999999999 ], [ 28447, 228.94300000000001,  172.52099999999999 ], [ 33029, 227.58500000000001,  170.95099999999999 ], [ 38350, 226.102,  169.36600000000001 ], [ 44527, 224.52000000000001,  167.78 ], [ 51700, 222.85400000000001,  166.202 ], [ 60028, 221.12200000000001,  164.637 ], [ 69697, 219.34,  163.09100000000001 ], [ 80924, 217.52000000000001,  161.56999999999999 ], [ 93959, 215.672,  160.07900000000001 ], [ 109094, 213.803,  158.61500000000001 ], [ 126667, 211.92500000000001,  157.18600000000001 ], [ 147071, 210.04499999999999,  155.791 ], [ 170762, 208.16900000000001,  154.43100000000001 ], [ 198268, 206.30099999999999,  153.108 ], [ 230206, 204.446,  151.81800000000001 ], [ 267287, 202.60599999999999,  150.56700000000001 ], [ 310342, 200.785,  149.34899999999999 ], [ 360333, 198.98599999999999,  148.167 ], [ 418376, 197.208,  147.018 ], [ 485768, 195.453,  145.904 ], [ 564016, 193.72399999999999,  144.81999999999999 ], [ 654869, 192.02099999999999,  143.77099999999999 ], [ 760356, 190.345,  142.75 ], [ 882835, 188.69499999999999,  141.75999999999999 ], [ 1025040, 187.07300000000001,  140.798 ], [ 1190160, 185.47900000000001,  139.86500000000001 ], [ 1381870, 183.91200000000001,  138.958 ], [ 1604460, 182.374,  138.077 ], [ 1862920, 180.86099999999999,  137.22300000000001 ], [ 2163000, 179.36799999999999,  136.386 ], [ 2511410, 177.898,  135.571 ], [ 2915960, 176.46000000000001,  134.78399999999999 ], [ 3385660, 175.04599999999999,  134.01599999999999 ], [ 3931030, 173.66300000000001,  133.273 ], [ 4564240, 172.30199999999999,  132.54900000000001 ], [ 5299460, 170.97999999999999,  131.84999999999999 ], [ 6153100, 169.667,  131.16399999999999 ], [ 7144250, 168.393,  130.50399999999999 ], [ 8295060, 167.12100000000001,  129.84899999999999 ], [ 9631240, 165.89500000000001,  129.22399999999999 ], [ 11182700, 164.69,  128.614 ], [ 12984000, 163.505,  128.01900000000001 ], [ 15075400, 162.38999999999999,  127.46299999999999 ], [ 17503800, 161.24000000000001,  126.89400000000001 ], [ 20323400, 160.11099999999999,  126.339 ], [ 23597100, 159.00299999999999,  125.798 ], [ 27398100, 157.916,  125.27 ], [ 31811400, 156.84800000000001,  124.75700000000001 ], [ 36935700, 155.80000000000001,  124.256 ], [ 42885300, 154.77000000000001,  123.765 ], [ 49793400, 153.75800000000001,  123.28700000000001 ], [ 57814100, 152.76499999999999,  122.821 ], [ 67126900, 151.78800000000001,  122.366 ], [ 77939800, 150.82900000000001,  121.92100000000001 ], [ 90494500, 149.886,  121.485 ], [ 105071000, 148.959,  121.06 ], [ 121997000, 148.048,  120.646 ], [ 141648000, 147.15100000000001,  120.239 ], [ 164465000, 146.26900000000001,  119.84 ], [ 190957000, 145.40000000000001,  119.45 ], [ 221716000, 144.54499999999999,  119.068 ], [ 257431000, 143.702,  118.69499999999999 ], [ 298898000, 142.87100000000001,  118.328 ], [ 347045000, 142.053,  117.967 ], [ 402948000, 141.233,  117.608 ], [ 467855000, 140.435,  117.26000000000001 ], [ 543218000, 139.64599999999999,  116.919 ], [ 630720000, 138.869,  116.584 ] ],
 	"specified_pump_work_amount" : 0,
 	"nameplate" : 30000,
 	"analysis_type" : 0,
 	"num_wells" : 3,
-	"num_wells_getem" : 4.2419632544315728,
+	"num_wells_getem" : 4.0745051952424838,
 	"conversion_type" : 0,
 	"plant_efficiency_input" : 80,
 	"conversion_subtype" : 0,
@@ -20,32 +25,35 @@
 	"temp_decline_rate" : 0.5,
 	"temp_decline_max" : 30,
 	"dt_prod_well" : 0,
-    "prod_well_choice" : 0,
-	"wet_bulb_temp" : 15,
+	"prod_well_choice" : 0,
+	"wet_bulb_temp" : 10,
+	"use_weather_file_conditions" : 0,
 	"ambient_pressure" : 14.699999999999999,
 	"well_flow_rate" : 110,
 	"pump_efficiency" : 67.5,
 	"delta_pressure_equip" : 40,
 	"excess_pressure_pump" : 50,
-	"well_diameter" : 12.25,
-	"casing_size" : 9.625,
-    "inj_casing_size" : 11.5,
-	"inj_well_diam" : 12.25,
+	"geotherm_cost_inj_cost_curve_welltype" : 0,
+	"geotherm_cost_prod_cost_curve_welltype" : 0,
+	"geotherm_cost_inj_cost_curve_welldiam" : 0,
+	"geotherm_cost_prod_cost_curve_welldiam" : 0,
 	"design_temp" : 200,
 	"specify_pump_work" : 0,
-	"rock_thermal_conductivity" : 259200,
+	"rock_thermal_conductivity" : 3,
 	"rock_specific_heat" : 950,
 	"rock_density" : 2600,
 	"reservoir_pressure_change_type" : 0,
-	"reservoir_pressure_change" : 0.40000000000000002,
+	"reservoir_pressure_change" : 2500,
+	"injectivity_index" : 3000,
+	"exploration_wells_production" : 2,
 	"reservoir_width" : 500,
 	"reservoir_height" : 100,
 	"reservoir_permeability" : 0.050000000000000003,
 	"inj_prod_well_distance" : 1500,
 	"subsurface_water_loss" : 2,
 	"fracture_aperature" : 0.00040000000000000002,
-    "fracture_length" : 1000,
-    "fracture_spacing" : 50,
+	"fracture_length" : 1000,
+	"fracture_spacing" : 50,
 	"fracture_width" : 175,
 	"num_fractures" : 6,
 	"fracture_angle" : 15,
@@ -76,7 +84,10 @@
 	"hc_ctl8" : 0,
 	"hc_ctl9" : 0,
 	"hybrid_dispatch_schedule" : "111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111",
-    "geotherm.cost.inj_cost_curve_welltype" : 0,
-    "geotherm.cost.prod_cost_curve_welltype" : 0,
-    "geotherm.cost.inj_prod_well_ratio" : 0.5
+	"allow_reservoir_replacements" : 0,
+	"adjust_constant" : 5,
+	"adjust_en_timeindex" : 0,
+	"adjust_en_periods" : 0,
+	"adjust_timeindex" : [ 0, 0, 0, 0, 0, 0, 0 ],
+	"adjust_periods" : [ [ 0,  0,  0 ] ]
 }

reV/SAM/defaults/i_pvwattsv5.json

@@ -1,5 +1,5 @@
 {
-  "adjust:constant": 0,
+  "adjust_constant": 0,
   "array_type": 0,
   "azimuth": 180,
   "dc_ac_ratio": 1.2000000476837158,

reV/SAM/defaults.py

@@ -11,7 +11,6 @@ import PySAM.Pvsamv1 as PySamDetailedPV
 import PySAM.Windpower as PySamWindPower
 import PySAM.TcsmoltenSalt as PySamCSP
 import PySAM.Swh as PySamSWH
-import PySAM.TroughPhysicalProcessHeat as PySamTPPH
 import PySAM.LinearFresnelDsgIph as PySamLDS
 import PySAM.Lcoefcr as PySamLCOE
 import PySAM.Singleowner as PySamSingleOwner
@@ -39,7 +38,7 @@ class AbstractDefaultFromConfigFile:
 
     @classmethod
     def init_default_pysam_obj(cls):
-        """Initialize a defualt PySM object from a config file."""
+        """Initialize a default PySAM object from a config file."""
         config_file = os.path.join(DEFAULTSDIR, cls.CONFIG_FILE_NAME)
 
         # pylint: disable=no-member
@@ -48,13 +47,13 @@ class AbstractDefaultFromConfigFile:
             config = json.load(f)
 
         for k, v in config.items():
-            if 'adjust:' in k or'file' in k :
+            if 'adjust_' in k or 'file' in k:
                 continue
             if 'geotherm.cost' in k:
                 k = k.replace(".", "_")
             obj.value(k, v)
 
-        obj.AdjustmentFactors.constant = 0.0
+        obj.AdjustmentFactors.adjust_constant = 0.0
         return obj
 
 
@@ -166,21 +165,6 @@ class DefaultSwh:
         return obj
 
 
-class DefaultTroughPhysicalProcessHeat:
-    """Class for default parabolic trough process heat"""
-
-    @staticmethod
-    def default():
-        """Get the default PySAM object"""
-        res_file = os.path.join(DEFAULTSDIR,
-                                'USA AZ Phoenix Sky Harbor Intl Ap (TMY3).csv')
-        obj = PySamTPPH.default('PhysicalTroughIPHNone')
-        obj.Weather.file_name = res_file
-        obj.execute()
-
-        return obj
-
-
 class DefaultLinearFresnelDsgIph:
     """Class for default linear direct steam heat"""
 

reV/SAM/generation.py

@@ -23,7 +23,6 @@ import PySAM.Pvwattsv7 as PySamPv7
 import PySAM.Pvwattsv8 as PySamPv8
 import PySAM.Swh as PySamSwh
 import PySAM.TcsmoltenSalt as PySamCSP
-import PySAM.TroughPhysicalProcessHeat as PySamTpph
 import PySAM.Windpower as PySamWindPower
 
 from reV.losses import PowerCurveLossesMixin, ScheduledLossesMixin
@@ -36,7 +35,6 @@ from reV.SAM.defaults import (
     DefaultPvWattsv8,
     DefaultSwh,
     DefaultTcsMoltenSalt,
-    DefaultTroughPhysicalProcessHeat,
     DefaultWindPower,
 )
 from reV.SAM.econ import LCOE, SingleOwner
@@ -55,6 +53,8 @@ logger = logging.getLogger(__name__)
 class AbstractSamGeneration(RevPySam, ScheduledLossesMixin, ABC):
     """Base class for SAM generation simulations."""
 
+    _GEN_KEY = "gen"
+
     def __init__(
         self,
         resource,
@@ -365,7 +365,7 @@ class AbstractSamGeneration(RevPySam, ScheduledLossesMixin, ABC):
             1D array of hourly power generation in kW.
             Datatype is float32 and array length is 8760*time_interval.
         """
-        return np.array(self["gen"], dtype=np.float32)
+        return np.array(self[self._GEN_KEY], dtype=np.float32)
 
     def collect_outputs(self, output_lookup=None):
         """Collect SAM output_request, convert timeseries outputs to UTC, and
@@ -524,12 +524,13 @@ class AbstractSamGeneration(RevPySam, ScheduledLossesMixin, ABC):
         """
         # initialize output dictionary
         out = {}
+        points = points_control.project_points
 
         # Get the RevPySam resource object
         resources = RevPySam.get_sam_res(
             res_file,
-            points_control.project_points,
-            points_control.project_points.tech,
+            points,
+            points.tech,
             output_request=output_request,
             gid_map=gid_map,
             lr_res_file=lr_res_file,
@@ -538,14 +539,17 @@ class AbstractSamGeneration(RevPySam, ScheduledLossesMixin, ABC):
         )
 
         # run resource through curtailment filter if applicable
-        curtailment = points_control.project_points.curtailment
+        curtailment = points.curtailment
         if curtailment is not None:
-            resources = curtail(
-                resources, curtailment, random_seed=curtailment.random_seed
-            )
+            for curtail_type, curtail_config in curtailment.items():
+                curtail_sites = points.get_sites_from_curtailment(curtail_type)
+                if not curtail_sites:
+                    continue
+                resources = curtail(resources, curtail_config, curtail_sites,
+                                    random_seed=curtail_config.random_seed)
 
         # iterate through project_points gen_gid values
-        for gen_gid in points_control.project_points.sites:
+        for gen_gid in points.sites:
             # Lookup the resource gid if there's a mapping and get the resource
             # data from the SAMResource object using the res_gid.
             res_gid = gen_gid if gid_map is None else gid_map[gen_gid]
@@ -555,7 +559,7 @@ class AbstractSamGeneration(RevPySam, ScheduledLossesMixin, ABC):
             if drop_leap:
                 site_res_df = cls.drop_leap(site_res_df)
 
-            _, inputs = points_control.project_points[gen_gid]
+            _, inputs = points[gen_gid]
 
             # get resource data pass-throughs and resource means
             res_outs, out_req_cleaned = cls._get_res(
@@ -1394,6 +1398,7 @@ class LinearDirectSteam(AbstractSamGenerationFromWeatherFile):
     MODULE = "lineardirectsteam"
     PYSAM = PySamLds
     PYSAM_WEATHER_TAG = "file_name"
+    _GEN_KEY = "gen_heat"
 
     def cf_mean(self):
         """Calculate mean capacity factor (fractional) from SAM.
@@ -1422,42 +1427,6 @@ class LinearDirectSteam(AbstractSamGenerationFromWeatherFile):
         return DefaultLinearFresnelDsgIph.default()
 
 
-class TroughPhysicalHeat(AbstractSamGenerationFromWeatherFile):
-    """
-    Trough Physical Process Heat generation
-    """
-
-    MODULE = "troughphysicalheat"
-    PYSAM = PySamTpph
-    PYSAM_WEATHER_TAG = "file_name"
-
-    def cf_mean(self):
-        """Calculate mean capacity factor (fractional) from SAM.
-
-        Returns
-        -------
-        output : float
-            Mean capacity factor (fractional).
-        """
-        net_power = (
-            self["annual_gross_energy"] - self["annual_thermal_consumption"]
-        )  # kW-hr
-        # q_pb_des is in MW, convert to kW-hr
-        name_plate = self["q_pb_design"] * 8760 * 1000
-
-        return net_power / name_plate
-
-    @staticmethod
-    def default():
-        """Get the executed default pysam trough object.
-
-        Returns
-        -------
-        PySAM.TroughPhysicalProcessHeat
-        """
-        return DefaultTroughPhysicalProcessHeat.default()
-
-
 # pylint: disable=line-too-long
 class Geothermal(AbstractSamGenerationFromWeatherFile):
     """reV-SAM geothermal generation.
@@ -1805,11 +1774,8 @@ class Geothermal(AbstractSamGenerationFromWeatherFile):
         self["ui_calculations_only"] = 0
 
     def _set_costs(self):
-        """Set the costs based on gross plant generation."""
-        plant_size_kw = (
-            self.sam_sys_inputs["resource_potential"]
-            / self._RESOURCE_POTENTIAL_MULT
-        ) * 1000
+        """Set the costs based on plant size"""
+        plant_size_kw = self.sam_sys_inputs["nameplate"]
 
         cc_per_kw = self.sam_sys_inputs.pop("capital_cost_per_kw", None)
         if cc_per_kw is not None:

reV/bespoke/bespoke.py

@@ -122,6 +122,11 @@ class BespokeMultiPlantData:
                 hh: res[f"pressure_{hh}m", :, gids]
                 for hh, gids in self.hh_to_res_gids.items()
             }
+            if self._pre_load_humidity:
+                self._relative_humidities = {
+                    hh: res["relativehumidity_2m", :, gids]
+                    for hh, gids in self.hh_to_res_gids.items()
+                }
             self._time_index = res.time_index
             if self._pre_load_humidity:
                 self._relative_humidities = {
@@ -153,15 +158,12 @@ class BespokeMultiPlantData:
 
         rh = (None if not self._pre_load_humidity
               else self._relative_humidities[hh][:, data_inds])
-        return BespokeSinglePlantData(
-            sc_point_res_gids,
-            self._wind_dirs[hh][:, data_inds],
-            self._wind_speeds[hh][:, data_inds],
-            self._temps[hh][:, data_inds],
-            self._pressures[hh][:, data_inds],
-            self._time_index,
-            rh,
-        )
+        return BespokeSinglePlantData(sc_point_res_gids,
+                                      self._wind_dirs[hh][:, data_inds],
+                                      self._wind_speeds[hh][:, data_inds],
+                                      self._temps[hh][:, data_inds],
+                                      self._pressures[hh][:, data_inds],
+                                      self._time_index, rh)
 
 
 class BespokeSinglePlantData:
@@ -172,10 +174,8 @@ class BespokeSinglePlantData:
     reads to a single HDF5 file.
     """
 
-    def __init__(
-        self, data_inds, wind_dirs, wind_speeds, temps, pressures, time_index,
-        relative_humidities=None,
-    ):
+    def __init__(self, data_inds, wind_dirs, wind_speeds, temps, pressures,
+                 time_index, relative_humidities=None):
         """Initialize BespokeSinglePlantData
 
         Parameters
@@ -247,37 +247,17 @@ class BespokeSinglePlant:
     DEPENDENCIES = ("shapely",)
     OUT_ATTRS = copy.deepcopy(Gen.OUT_ATTRS)
 
-    def __init__(
-        self,
-        gid,
-        excl,
-        res,
-        tm_dset,
-        sam_sys_inputs,
-        objective_function,
-        capital_cost_function,
-        fixed_operating_cost_function,
-        variable_operating_cost_function,
-        balance_of_system_cost_function,
-        min_spacing="5x",
-        wake_loss_multiplier=1,
-        ga_kwargs=None,
-        output_request=("system_capacity", "cf_mean"),
-        ws_bins=(0.0, 20.0, 5.0),
-        wd_bins=(0.0, 360.0, 45.0),
-        excl_dict=None,
-        inclusion_mask=None,
-        data_layers=None,
-        resolution=64,
-        excl_area=None,
-        exclusion_shape=None,
-        eos_mult_baseline_cap_mw=200,
-        prior_meta=None,
-        gid_map=None,
-        bias_correct=None,
-        pre_loaded_data=None,
-        close=True,
-    ):
+    def __init__(self, gid, excl, res, tm_dset, sam_sys_inputs,
+                 objective_function, capital_cost_function,
+                 fixed_operating_cost_function,
+                 variable_operating_cost_function,
+                 balance_of_system_cost_function, min_spacing='5x',
+                 ga_kwargs=None, output_request=('system_capacity', 'cf_mean'),
+                 ws_bins=(0.0, 20.0, 5.0), wd_bins=(0.0, 360.0, 45.0),
+                 excl_dict=None, inclusion_mask=None, data_layers=None,
+                 resolution=64, excl_area=None, exclusion_shape=None,
+                 eos_mult_baseline_cap_mw=200, prior_meta=None, gid_map=None,
+                 bias_correct=None, pre_loaded_data=None, close=True):
         """
         Parameters
         ----------
@@ -353,13 +333,6 @@ class BespokeSinglePlant:
             Minimum spacing between turbines in meters. Can also be a string
             like "5x" (default) which is interpreted as 5 times the turbine
             rotor diameter.
-        wake_loss_multiplier : float, optional
-            A multiplier used to scale the annual energy lost due to
-            wake losses.
-            .. WARNING:: This multiplier will ONLY be applied during the
-            optimization process and will NOT be come through in output
-            values such as the hourly profiles,
-            aep, any of the cost functions, or even the output objective.
         ga_kwargs : dict | None
             Dictionary of keyword arguments to pass to GA initialization.
             If `None`, default initialization values are used.
@@ -460,9 +433,6 @@ class BespokeSinglePlant:
             "Bespoke objective function: {}".format(objective_function)
         )
         logger.debug("Bespoke cost function: {}".format(objective_function))
-        logger.debug(
-            "Bespoke wake loss multiplier: {}".format(wake_loss_multiplier)
-        )
         logger.debug("Bespoke GA initialization kwargs: {}".format(ga_kwargs))
         logger.debug(
             "Bespoke EOS multiplier baseline capacity: {:,} MW".format(
@@ -494,7 +464,6 @@ class BespokeSinglePlant:
         )
         self.balance_of_system_cost_function = balance_of_system_cost_function
         self.min_spacing = min_spacing
-        self.wake_loss_multiplier = wake_loss_multiplier
         self.ga_kwargs = ga_kwargs or {}
 
         self._sam_sys_inputs = sam_sys_inputs
@@ -747,6 +716,9 @@ class BespokeSinglePlant:
             mask = self.sc_point._h5_gids == gid
             weights[i] = self.sc_point.include_mask_flat[mask].sum()
 
+        if "float" not in str(data.dtype):
+            data = data.astype("float32")
+
         weights /= weights.sum()
         data = data.astype(np.float32)
         data *= weights
@@ -847,7 +819,12 @@ class BespokeSinglePlant:
         if self._wind_plant_pd is None:
             return config
 
-        config.update(self._wind_plant_pd.sam_sys_inputs)
+        layout_config = copy.deepcopy(self._wind_plant_pd.sam_sys_inputs)
+        # `wind_plant_pd` PC may have PC losses applied, so keep the
+        # original PC as to not double count losses here
+        layout_config.pop("wind_turbine_powercurve_powerout", None)
+        config.update(layout_config)
+
         return config
 
     @property
@@ -1089,9 +1066,7 @@ class BespokeSinglePlant:
                 self.balance_of_system_cost_function,
                 self.include_mask,
                 self.pixel_side_length,
-                self.min_spacing,
-                self.wake_loss_multiplier,
-            )
+                self.min_spacing)
 
         return self._plant_optm
 
@@ -1206,7 +1181,7 @@ class BespokeSinglePlant:
                           ignore=('wind_resource_model_choice',
                                   'wind_resource_data',
                                   'wind_turbine_powercurve_powerout',
-                                  'hourly',
+                                  'adjust_hourly',
                                   'capital_cost',
                                   'fixed_operating_cost',
                                   'variable_operating_cost',
@@ -1513,8 +1488,8 @@ class BespokeWindPlants(BaseAggregation):
                  capital_cost_function, fixed_operating_cost_function,
                  variable_operating_cost_function,
                  balance_of_system_cost_function, project_points,
-                 sam_files, min_spacing='5x', wake_loss_multiplier=1,
-                 ga_kwargs=None, output_request=('system_capacity', 'cf_mean'),
+                 sam_files, min_spacing='5x', ga_kwargs=None,
+                 output_request=('system_capacity', 'cf_mean'),
                  ws_bins=(0.0, 20.0, 5.0), wd_bins=(0.0, 360.0, 45.0),
                  excl_dict=None, area_filter_kernel='queen', min_area=None,
                  resolution=64, excl_area=None, data_layers=None,
@@ -1730,16 +1705,6 @@ class BespokeWindPlants(BaseAggregation):
             Minimum spacing between turbines (in meters). This input can
             also be a string like "5x", which is interpreted as 5 times
             the turbine rotor diameter. By default, ``"5x"``.
-        wake_loss_multiplier : float, optional
-            A multiplier used to scale the annual energy lost due to
-            wake losses.
-
-            .. WARNING:: This multiplier will ONLY be applied during the
-               optimization process and will NOT come through in output
-               values such as the hourly profiles, aep, any of the cost
-               functions, or even the output objective.
-
-            By default, ``1``.
         ga_kwargs : dict, optional
             Dictionary of keyword arguments to pass to GA
             initialization. If ``None``, default initialization values
@@ -1973,8 +1938,6 @@ class BespokeWindPlants(BaseAggregation):
                     .format(variable_operating_cost_function))
         logger.info('Bespoke balance of system cost function: {}'
                     .format(balance_of_system_cost_function))
-        logger.info('Bespoke wake loss multiplier: {}'
-                    .format(wake_loss_multiplier))
         logger.info('Bespoke GA initialization kwargs: {}'.format(ga_kwargs))
 
         logger.info(
@@ -2012,7 +1975,6 @@ class BespokeWindPlants(BaseAggregation):
         self._voc_fun = variable_operating_cost_function
         self._bos_fun = balance_of_system_cost_function
         self._min_spacing = min_spacing
-        self._wake_loss_multiplier = wake_loss_multiplier
         self._ga_kwargs = ga_kwargs or {}
         self._output_request = SAMOutputRequest(output_request)
         self._ws_bins = ws_bins
@@ -2486,8 +2448,8 @@ class BespokeWindPlants(BaseAggregation):
                    capital_cost_function,
                    fixed_operating_cost_function,
                    variable_operating_cost_function,
-                   balance_of_system_cost_function,
-                   min_spacing='5x', wake_loss_multiplier=1, ga_kwargs=None,
+                   balance_of_system_cost_function, min_spacing='5x',
+                   ga_kwargs=None,
                    output_request=('system_capacity', 'cf_mean'),
                    ws_bins=(0.0, 20.0, 5.0), wd_bins=(0.0, 360.0, 45.0),
                    excl_dict=None, inclusion_mask=None,
@@ -2549,7 +2511,6 @@ class BespokeWindPlants(BaseAggregation):
                         variable_operating_cost_function,
                         balance_of_system_cost_function,
                         min_spacing=min_spacing,
-                        wake_loss_multiplier=wake_loss_multiplier,
                         ga_kwargs=ga_kwargs,
                         output_request=output_request,
                         ws_bins=ws_bins,
@@ -2638,7 +2599,6 @@ class BespokeWindPlants(BaseAggregation):
                     self._voc_fun,
                     self._bos_fun,
                     self._min_spacing,
-                    wake_loss_multiplier=self._wake_loss_multiplier,
                     ga_kwargs=self._ga_kwargs,
                     output_request=self._output_request,
                     ws_bins=self._ws_bins,
@@ -2716,7 +2676,6 @@ class BespokeWindPlants(BaseAggregation):
                 prior_meta = self._get_prior_meta(gid)
                 pre_loaded_data = self._pre_loaded_data_for_sc_gid(gid)
                 afk = self._area_filter_kernel
-                wlm = self._wake_loss_multiplier
                 i_bc = self._get_bc_for_gid(gid)
                 ebc = self._eos_mult_baseline_cap_mw
 
@@ -2730,7 +2689,6 @@ class BespokeWindPlants(BaseAggregation):
                                      self._voc_fun,
                                      self._bos_fun,
                                      min_spacing=self._min_spacing,
-                                     wake_loss_multiplier=wlm,
                                      ga_kwargs=self._ga_kwargs,
                                      output_request=self._output_request,
                                      ws_bins=self._ws_bins,

reV/bespoke/cli_bespoke.py

@@ -56,8 +56,6 @@ def _log_bespoke_cli_inputs(config):
                 .format(config.get("variable_operating_cost_function")))
     logger.info('Bespoke balance of system cost function: "{}"'
                 .format(config.get("balance_of_system_cost_function")))
-    logger.info('Bespoke wake loss multiplier: "{}"'
-                .format(config.get("wake_loss_multiplier", 1)))
     logger.info('The following project points were specified: "{}"'
                 .format(config.get('project_points', None)))
     logger.info('The following SAM configs are available to this run:\n{}'

reV/bespoke/pack_turbs.py

@@ -4,10 +4,10 @@ turbine packing module.
 """
 import numpy as np
 from shapely.geometry import Polygon, MultiPolygon, Point
-from reV.bespoke.plotting_functions import get_xy
 from reV.utilities.exceptions import WhileLoopPackingError
 
 
+
 class PackTurbines():
     """Framework to maximize plant capacity in a provided wind plant area.
     """
@@ -81,24 +81,22 @@ class PackTurbines():
         self.turbine_y = np.array([])
 
 
-def smallest_area_with_tiebreakers(g):
-    """_summary_
-
-    This function helps break ties in the area of two different
-    geometries using their exterior coordinate values.
+def get_xy(A):
+    """separate polygon exterior coordinates to x and y
 
     Parameters
     ----------
-    g : _type_
-        A geometry object with an `area` and an
-        `exterior.coords` coords attribute.
+    A : Polygon.exteroir.coords
+        Exterior coordinates from a shapely Polygon
 
-    Returns
-    -------
-    tuple
-        Tuple with the following elements:
-            - area of the geometry
-            - minimum exterior coordinate (southwest)
-            - maximum exterior coordinate (northeast)
+    Outputs
+    ----------
+    x, y : array
+        Boundary polygon x and y coordinates
     """
-    return g.area, min(g.exterior.coords), max(g.exterior.coords)
+    x = np.zeros(len(A))
+    y = np.zeros(len(A))
+    for i, _ in enumerate(A):
+        x[i] = A[i][0]
+        y[i] = A[i][1]
+    return x, y