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

{NREL_reV-0.9.2.dist-info → NREL_reV-0.9.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NREL-reV
-Version: 0.9.2
+Version: 0.9.5
 Summary: National Renewable Energy Laboratory's (NREL's) Renewable Energy Potential(V) Model: reV
 Home-page: https://nrel.github.io/reV/
 Author: Galen Maclaurin
@@ -17,22 +17,22 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
-Requires-Dist: NREL-gaps >=0.6.11
-Requires-Dist: NREL-NRWAL >=0.0.7
-Requires-Dist: NREL-PySAM ~=4.1.0
-Requires-Dist: NREL-rex >=0.2.85
-Requires-Dist: numpy ~=1.24.4
-Requires-Dist: packaging >=20.3
-Requires-Dist: plotly >=4.7.1
-Requires-Dist: plotting >=0.0.6
+Requires-Dist: NREL-gaps>=0.6.11
+Requires-Dist: NREL-NRWAL>=0.0.7
+Requires-Dist: NREL-PySAM~=4.1.0
+Requires-Dist: NREL-rex>=0.2.89
+Requires-Dist: numpy~=1.24.4
+Requires-Dist: packaging>=20.3
+Requires-Dist: plotly>=4.7.1
+Requires-Dist: plotting>=0.0.6
 Requires-Dist: shapely
 Provides-Extra: dev
-Requires-Dist: pytest >=5.2 ; extra == 'dev'
-Requires-Dist: flake8 ; extra == 'dev'
-Requires-Dist: pre-commit ; extra == 'dev'
-Requires-Dist: pylint ; extra == 'dev'
+Requires-Dist: pytest>=5.2; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: pylint; extra == "dev"
 Provides-Extra: test
-Requires-Dist: pytest >=5.2 ; extra == 'test'
+Requires-Dist: pytest>=5.2; extra == "test"
 
 
                        

{NREL_reV-0.9.2.dist-info → NREL_reV-0.9.5.dist-info}/RECORD

@@ -1,11 +1,11 @@
 reV/__init__.py,sha256=tXTpWu_qVo3uotfSw_TJ-gNbidGaIPPfUTwBlpCMJ-g,856
 reV/cli.py,sha256=jfGGOr6QlLz8ghA7vBgx5-VgNsy4bBQo5DdHk42-q9A,1601
-reV/version.py,sha256=ZggWF5z5HY0xtKYNitKGKEQSDJ5G21AZQKZMzs5u-wo,50
-reV/SAM/SAM.py,sha256=SUyaWK3InUh90iQqbka-g_X36EfGuwslEfKEPCIpMrw,31691
+reV/version.py,sha256=-d0FHT8TbXm_fBuvfSz3da_dWANi_ww6eK4n0DOIYU0,50
+reV/SAM/SAM.py,sha256=1xuxs2gb1wsgbBkhj3mdQVDuSWbp5T5Bh7kLRl69pkg,32258
 reV/SAM/__init__.py,sha256=LJqoncyKDY5ZP5WA4kboh561bce11F9Ge645Izah0EY,240
 reV/SAM/defaults.py,sha256=2zqT_mfrVtbvU7Pe6H4anNtiVkIyQbuJcGIOARzEsbM,7193
 reV/SAM/econ.py,sha256=dFhtUXp5eozSsPyk0XXji0HGexKJnxoct8cwE1ApHVg,20704
-reV/SAM/generation.py,sha256=D4vkir6uU9QgY_9AMQOXA-4blGcQoxRH0O6PEfgqWok,89142
+reV/SAM/generation.py,sha256=vUM2DUHCsKh_FBzuUKtFsq_oUXxm47c-oP33KvfA7Ow,86524
 reV/SAM/version_checker.py,sha256=q-eXsmSB08A5hSelNH7uAe_bqPpqjsxaiS3OBjXBs-0,3997
 reV/SAM/windbos.py,sha256=fnq1uxtSl-vtJth0gTlHkCSsmvDbRROCo9RGdqA7hK4,7504
 reV/SAM/defaults/USA AZ Phoenix Sky Harbor Intl Ap (TMY3).csv,sha256=8QorTX0ACjgPgNV7kLSpTHOqfY4E17gkkpKB-qseiFk,406896
@@ -14,7 +14,7 @@ reV/SAM/defaults/US_Wave.csv,sha256=wvn9vGl9ZGKVHbCyq4muhMI6x1-nAaQfDS3hC4ftwBA,
 reV/SAM/defaults/geothermal.json,sha256=ivxnpxkfBrEl1MwLKXClLJfTfvF5UrbN87wpC_BFLck,2598
 reV/SAM/defaults/i_pvwattsv5.json,sha256=pZpNlK5MiowZmNwY7i9XRWp9G8pPLirwdBWCMVJVuKE,312
 reV/bespoke/__init__.py,sha256=vpXbyBUrUsTgK8UP_LafMjLiDg2CRG9WZLHPsOJoxek,109
-reV/bespoke/bespoke.py,sha256=DgNPIeCmeqpOSaMbaqmJKQGatoLd8MOPTTQpZBlvzJI,110353
+reV/bespoke/bespoke.py,sha256=nWmryaLRFkOwkYLkKUQHgjXqc5YcFGODK4k6VEX0bRU,113473
 reV/bespoke/cli_bespoke.py,sha256=nZc6rJlfxH2IXUz9bym4EO-C1k6VvulgweWoRrMg_cE,3028
 reV/bespoke/gradient_free.py,sha256=URWV1yiO2jyWk3_GOpfpLV_wlgJhXXGmTUwCB3WTV0Y,12015
 reV/bespoke/pack_turbs.py,sha256=l4btC2dPZkLvDgAAGVhAYgAZDbvwimGYRdrQDq0xT68,3740
@@ -37,7 +37,7 @@ reV/econ/utilities.py,sha256=ZOA49S1jfsvdenvlL7m-BAJIrAvpAHSix5-wrSW0uLc,1232
 reV/generation/__init__.py,sha256=LBecrbpL69tROol_OwVHTKBrTqgSSxJW59fs0k3o0jQ,75
 reV/generation/base.py,sha256=p6g8Bj8T98OfKu44LTocGtEozstbUvti6wSi3oroS5U,48758
 reV/generation/cli_gen.py,sha256=5RSlr8yO9zlB-1FzFZGClqsxqsrbr9rcS_8PlOjVx2s,4435
-reV/generation/generation.py,sha256=jtlUcfmQKDcXarRwj-iJBS_60TG-w2TKoowfU_1tBQg,46981
+reV/generation/generation.py,sha256=o6nJlEcgs-QQ_fdqva-7jOhWl1wj-J7CIrRR5qNJyEQ,47434
 reV/generation/output_attributes/generation.json,sha256=cy8efVCJgNSYCsR3x3_VpMCtynYS3oaQG4M2MwcdzFY,4954
 reV/generation/output_attributes/lcoe_fcr.json,sha256=d_TGMkZsmsfDXQiWfhYjFkmwqi-wKF8JdHmiMCj2h38,136
 reV/generation/output_attributes/lcoe_fcr_inputs.json,sha256=Yb-WTXt9YD4wE4Uu315W2uLFH6g3fT40YY83mxS-aWE,1289
@@ -51,7 +51,7 @@ reV/handlers/__init__.py,sha256=N7KfWbXfHLizMpoUw6yo0egbyq3jb9QL4YouBLUf4mI,130
 reV/handlers/cli_collect.py,sha256=QRjhuJ1lV4BwGoguu0m4etrNRPMXGIZlijNyYsb7_5U,799
 reV/handlers/cli_multi_year.py,sha256=xMAQ70lVUMAPM10EkZwc_FreQLjnzQ9VmKl48MS1SO0,660
 reV/handlers/exclusions.py,sha256=_s-LHbjHAAHSIM6tFXCoJlLKcv0FBxbm6JAmuE_X_-I,12266
-reV/handlers/multi_year.py,sha256=3s4sYWBl9-1rxeTBTMkl5lDeFqCioi4uuxcZlbWmIbE,30998
+reV/handlers/multi_year.py,sha256=nLskop2crDnRfd0DwnFw6SZZBqgiJbf9BABtr7u4j7w,30789
 reV/handlers/outputs.py,sha256=VbSPFwA0ZH-oWUCCtef7zGyPbWXKY07ilPzpZIOMmuc,6034
 reV/handlers/transmission.py,sha256=JzpmiweCez7vzGSutO21XIbG9czY_H6ysg_R7z290w0,25610
 reV/hybrids/__init__.py,sha256=oBrJSt9WeBlER7GVd-NEJgVqFlasl0WuyHJRMgLgpAY,133
@@ -74,24 +74,24 @@ reV/rep_profiles/cli_rep_profiles.py,sha256=i3fRolT7HTzTQePXpNLDyxwgpRa7FEfHO1mO
 reV/rep_profiles/rep_profiles.py,sha256=oqmtU9FbUlKurkglmZLyDBNH8VRKv8fgdSuvtYWLm04,48271
 reV/supply_curve/__init__.py,sha256=dbf0cO0qmt1VhV8dnDddztrcpnwua9T2HBhM6tLKaP8,274
 reV/supply_curve/aggregation.py,sha256=fv4FTdRUQWZ_1Ds84ubgJdrf5lR1xb3luhAnibe3Y3Q,38752
-reV/supply_curve/cli_sc_aggregation.py,sha256=drzYGFEHC3Ww1GBnk_iClFoQuXjT3nUEpv8I4Fgx8W4,2867
+reV/supply_curve/cli_sc_aggregation.py,sha256=qGfJyZjg4tFARG2dl-wAlHv9KjEp2u4wg1Boxz18Gf0,3347
 reV/supply_curve/cli_supply_curve.py,sha256=e-XrHQIe4OqWTL6u-TUAyHrw7Alk7vkXQ2HoLbE3zTM,2163
 reV/supply_curve/competitive_wind_farms.py,sha256=eOjM72-4oWtsqxB7Wh2gnB2zVAt4LY3iPE_DqWdXbQ4,15795
 reV/supply_curve/exclusions.py,sha256=4-ZxTO5Vlu03vie0V_74uvdajQfCuC8FE96Pg8I4U_c,42950
 reV/supply_curve/extent.py,sha256=a31po753hXSxQ8lfcCvpE8hoKc4bY7MmYq0NO0jtdqA,17414
 reV/supply_curve/points.py,sha256=YEYHpn3KlBbGqpxywrfbrUrlhL3BndgX7cVQerdB6zg,86107
-reV/supply_curve/sc_aggregation.py,sha256=6kJg4CaLlFAC196azbfzA-T_wXkXSwNDQKOW-k2lqcE,61645
+reV/supply_curve/sc_aggregation.py,sha256=R_h3xXKum4JTYMuq2us0rWhW0t2wm-G9Wj2on1d8FeY,61604
 reV/supply_curve/supply_curve.py,sha256=igbloCkvYQwaH4zjbrYO17J7TtCTX5dKkk-TnlGJJeY,69931
-reV/supply_curve/tech_mapping.py,sha256=7him2R-8kpigI47ATSN4ncnvzuF_AzeXyrtz_jmzLug,18573
+reV/supply_curve/tech_mapping.py,sha256=nfqPIj9o1pllX3aRC1Hi2KGXYJOYy68Vbvr_1asNmFk,18573
 reV/utilities/__init__.py,sha256=iOvOuqcXv_WaSP627z2i2wF5820DbUSGRa7lSj23diQ,10534
 reV/utilities/cli_functions.py,sha256=1_T_sXz0Ct8lW-vOk3mMRcpD6NYsc9cGI7dEujIi9z4,3864
 reV/utilities/curtailment.py,sha256=fu48Lje-iyd2Awfe-6jFebvgcKSeJ3daNNTqjFI2GvM,4963
 reV/utilities/exceptions.py,sha256=f7sRGsbFLpmL6Caq_H1cD4GfVhnLMyvYUsLPA1UVDDE,3974
 reV/utilities/pytest_utils.py,sha256=T22NFEGxPOc9wRwgy0Pt2cHvw3Vam9cKwUj4AkzI7bU,3244
 reV/utilities/slots.py,sha256=xsw-JuUVZ0YeoCNuwP_HxGNxFMA4xRs1tuImXHIJqaU,2618
-NREL_reV-0.9.2.dist-info/LICENSE,sha256=hDwoTANtan2ZpufBlXm5C3W_PJ-mCqItvlcobgjxL7k,1526
-NREL_reV-0.9.2.dist-info/METADATA,sha256=eIecsAhbE1ayna5v0f8gIhfDFYeHN_Mgyjdo_uLEATY,10294
-NREL_reV-0.9.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-NREL_reV-0.9.2.dist-info/entry_points.txt,sha256=KGtPEOQRZMSqKXjjv5jt_T4e4HQN0fHiaGdAWwTtuW4,617
-NREL_reV-0.9.2.dist-info/top_level.txt,sha256=S6YF2ZYgXUB6n28SY0K2H8YB9tMJdXQ9CyQbo6VC89M,4
-NREL_reV-0.9.2.dist-info/RECORD,,
+NREL_reV-0.9.5.dist-info/LICENSE,sha256=hDwoTANtan2ZpufBlXm5C3W_PJ-mCqItvlcobgjxL7k,1526
+NREL_reV-0.9.5.dist-info/METADATA,sha256=hx7F_iukuZl9zoHjAmjElOamOiFwUJPjVa0r2WpFiUY,10279
+NREL_reV-0.9.5.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+NREL_reV-0.9.5.dist-info/entry_points.txt,sha256=KGtPEOQRZMSqKXjjv5jt_T4e4HQN0fHiaGdAWwTtuW4,617
+NREL_reV-0.9.5.dist-info/top_level.txt,sha256=S6YF2ZYgXUB6n28SY0K2H8YB9tMJdXQ9CyQbo6VC89M,4
+NREL_reV-0.9.5.dist-info/RECORD,,

{NREL_reV-0.9.2.dist-info → NREL_reV-0.9.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: bdist_wheel (0.44.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

reV/SAM/SAM.py

@@ -195,6 +195,11 @@ class SamResourceRetriever:
                 # make precip rate available for curtailment analysis
                 kwargs["precip_rate"] = True
 
+            sam_configs = project_points.sam_inputs.values()
+            needs_wd = any(_sam_config_contains_turbine_layout(sam_config)
+                           for sam_config in sam_configs)
+            kwargs["require_wind_dir"] = needs_wd
+
         elif res_handler == GeothermalResource:
             args += (project_points.d,)
 
@@ -922,6 +927,9 @@ class RevPySam(Sam):
 
 def _add_cost_defaults(sam_inputs):
     """Add default values for required cost outputs if they are missing. """
+    if sam_inputs.get("__already_added_cost_defaults"):
+        return
+
     sam_inputs.setdefault("fixed_charge_rate", None)
 
     reg_mult = sam_inputs.setdefault("capital_cost_multiplier", 1)
@@ -938,6 +946,8 @@ def _add_cost_defaults(sam_inputs):
     else:
         sam_inputs["capital_cost"] = None
 
+    sam_inputs["__already_added_cost_defaults"] = True
+
 
 def _add_sys_capacity(sam_inputs):
     """Add system capacity SAM input if it is missing. """
@@ -954,3 +964,8 @@ def _add_sys_capacity(sam_inputs):
         cap = sam_inputs.get("nameplate")
 
     sam_inputs["system_capacity"] = cap
+
+
+def _sam_config_contains_turbine_layout(sam_config):
+    """Detect wether SAM config contains multiple turbines in layout. """
+    return len(sam_config.get("wind_farm_xCoordinates", ())) > 1

reV/SAM/generation.py

@@ -1546,23 +1546,6 @@ class Geothermal(AbstractSamGenerationFromWeatherFile):
         - ``conversion_type`` : Integer flag representing the conversion
           plant type. Either Binary (0) or Flash (1). Only values of 0
           or 1 allowed.
-        - ``design_temp`` : EGS plant design temperature (in C). Only
-          affects EGS runs. This value may be adjusted internally by
-          ``reV under the following conditions:
-
-              - The design temperature is larger than the resource
-                temperature
-              - The design temperature is lower than the resource
-                temperature by a factor of ``MAX_RT_TO_EGS_RATIO``
-
-          If either of these conditions are true, the ``design_temp`` is
-          adjusted to match the resource temperature input in order to
-          avoid SAM errors.
-        - ``set_EGS_PDT_to_RT`` : Boolean flag to set EGS design
-          temperature to match the resource temperature input. If this
-          is ``True``, the ``design_temp`` input is ignored. This helps
-          avoid SAM/GETEM errors when the plant design temperature is
-          too high/low compared to the resource temperature.
         - ``geotherm.cost.inj_prod_well_ratio`` : Fraction representing
           the injection to production well ratio (0-1). SAM GUI defaults
           to 0.5 for this value, but it is recommended to set this to
@@ -1632,10 +1615,6 @@ class Geothermal(AbstractSamGenerationFromWeatherFile):
 
     """
 
-    # Per Matt Prilliman on 2/22/24, it's unclear where this ratio originates,
-    # but SAM errors out if it's exceeded.
-    MAX_RT_TO_EGS_RATIO = 1.134324
-    """Max value of ``resource_temperature``/``EGS_plan_design_temperature``"""
     MODULE = "geothermal"
     PYSAM = PySamGeothermal
     PYSAM_WEATHER_TAG = "file_name"
@@ -1738,52 +1717,14 @@ class Geothermal(AbstractSamGenerationFromWeatherFile):
         self.sam_sys_inputs["resource_temp"] = val
 
     def _set_egs_plant_design_temperature(self):
-        """Set the EGS plant temp to match resource, if necessary"""
+        """Set the EGS plant temp to match resource (avoids cf > 1)"""
         if self.sam_sys_inputs.get("resource_type") != 1:
             return  # Not EGS run
 
-        set_egs_pdt_to_rt = self.sam_sys_inputs.get("set_EGS_PDT_to_RT", False)
-        egs_plant_design_temp = self.sam_sys_inputs.get("design_temp", 0)
         resource_temp = self.sam_sys_inputs["resource_temp"]
-
-        if set_egs_pdt_to_rt:
-            msg = (
-                "Setting EGS plant design temperature ({}C) to match "
-                "resource temperature ({}C)".format(
-                    egs_plant_design_temp, resource_temp
-                )
-            )
-            logger.info(msg)
-            self.sam_sys_inputs["design_temp"] = resource_temp
-            return
-
-        if egs_plant_design_temp > resource_temp:
-            msg = (
-                "EGS plant design temperature ({}C) exceeds resource "
-                "temperature ({}C). Lowering EGS plant design temperature "
-                "to match resource temperature".format(
-                    egs_plant_design_temp, resource_temp
-                )
-            )
-            logger.warning(msg)
-            warn(msg)
-            self.sam_sys_inputs["design_temp"] = resource_temp
-            return
-
-        if resource_temp / egs_plant_design_temp > self.MAX_RT_TO_EGS_RATIO:
-            msg = (
-                "EGS plant design temperature ({}C) is lower than resource "
-                "temperature ({}C) by more than a factor of {}. Increasing "
-                "EGS plant design temperature to match resource "
-                "temperature".format(
-                    egs_plant_design_temp,
-                    resource_temp,
-                    self.MAX_RT_TO_EGS_RATIO,
-                )
-            )
-            logger.warning(msg)
-            warn(msg)
-            self.sam_sys_inputs["design_temp"] = resource_temp
+        logger.debug("Setting EGS plant design temperature to match "
+                     "resource temperature ({}C)".format(resource_temp))
+        self.sam_sys_inputs["design_temp"] = resource_temp
 
     def _set_nameplate_to_match_resource_potential(self, resource):
         """Set the nameplate capacity to match the resource potential."""

reV/bespoke/bespoke.py

@@ -20,7 +20,6 @@ import pandas as pd
 import psutil
 from rex.joint_pd.joint_pd import JointPD
 from rex.multi_year_resource import MultiYearWindResource
-from rex.renewable_resource import WindResource
 from rex.utilities.bc_parse_table import parse_bc_table
 from rex.utilities.execution import SpawnProcessPool
 from rex.utilities.loggers import create_dirs, log_mem
@@ -55,13 +54,19 @@ class BespokeMultiPlantData:
     reads to a single HDF5 file.
     """
 
-    def __init__(self, res_fpath, sc_gid_to_hh, sc_gid_to_res_gid):
+    def __init__(self, res_fpath, sc_gid_to_hh, sc_gid_to_res_gid,
+                 pre_load_humidity=False):
         """Initialize BespokeMultiPlantData
 
         Parameters
         ----------
-        res_fpath : str
-            Path to resource h5 file.
+        res_fpath : str | list
+            Unix shell style path (potentially containing wildcard (*)
+            patterns) to a single or multi-file resource file set(s).
+            Can also be an explicit list of resource file paths, which
+            themselves can contain wildcards. This input must be
+            readable by
+            :py:class:`rex.multi_year_resource.MultiYearWindResource`.
         sc_gid_to_hh : dict
             Dictionary mapping SC GID values to hub-heights. Data for
             each SC GID will be pulled for the corresponding hub-height
@@ -69,8 +74,11 @@ class BespokeMultiPlantData:
         sc_gid_to_res_gid : dict
             Dictionary mapping SC GID values to an iterable oif resource
             GID values. Resource GID values should correspond to GID
-            values in teh HDF5 file, so any GID map must be applied
+            values in the HDF5 file, so any GID map must be applied
             before initializing :class`BespokeMultiPlantData`.
+        pre_load_humidity : optional, default=False
+            Option to pre-load relative humidity data (useful for icing
+            runs). If ``False``, relative humidities are not loaded.
         """
         self.res_fpath = res_fpath
         self.sc_gid_to_hh = sc_gid_to_hh
@@ -80,6 +88,8 @@ class BespokeMultiPlantData:
         self._wind_speeds = None
         self._temps = None
         self._pressures = None
+        self._relative_humidities = None
+        self._pre_load_humidity = pre_load_humidity
         self._time_index = None
         self._pre_load_data()
 
@@ -95,12 +105,7 @@ class BespokeMultiPlantData:
         }
 
         start_time = time.time()
-        if "*" in self.res_fpath:
-            handler = MultiYearWindResource
-        else:
-            handler = WindResource
-
-        with handler(self.res_fpath) as res:
+        with MultiYearWindResource(self.res_fpath) as res:
             self._wind_dirs = {
                 hh: res[f"winddirection_{hh}m", :, gids]
                 for hh, gids in self.hh_to_res_gids.items()
@@ -118,6 +123,11 @@ class BespokeMultiPlantData:
                 for hh, gids in self.hh_to_res_gids.items()
             }
             self._time_index = res.time_index
+            if self._pre_load_humidity:
+                self._relative_humidities = {
+                    hh: res["relativehumidity_2m", :, gids]
+                    for hh, gids in self.hh_to_res_gids.items()
+                }
 
         logger.debug(
             f"Data took {(time.time() - start_time) / 60:.2f} " f"min to load"
@@ -140,6 +150,9 @@ class BespokeMultiPlantData:
         hh = self.sc_gid_to_hh[sc_gid]
         sc_point_res_gids = sorted(self.sc_gid_to_res_gid[sc_gid])
         data_inds = np.searchsorted(self.hh_to_res_gids[hh], sc_point_res_gids)
+
+        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],
@@ -147,6 +160,7 @@ class BespokeMultiPlantData:
             self._temps[hh][:, data_inds],
             self._pressures[hh][:, data_inds],
             self._time_index,
+            rh,
         )
 
 
@@ -159,7 +173,8 @@ class BespokeSinglePlantData:
     """
 
     def __init__(
-        self, data_inds, wind_dirs, wind_speeds, temps, pressures, time_index
+        self, data_inds, wind_dirs, wind_speeds, temps, pressures, time_index,
+        relative_humidities=None,
     ):
         """Initialize BespokeSinglePlantData
 
@@ -170,22 +185,41 @@ class BespokeSinglePlantData:
             the second dimension of `wind_dirs`, `wind_speeds`, `temps`,
             and `pressures`. The GID value of data_inds[0] should
             correspond to the `wind_dirs[:, 0]` data, etc.
-        wind_dirs, wind_speeds, temps, pressures : 2D np.array
-            Array of wind directions, wind speeds, temperatures, and
+        wind_dirs : 2D np.array
+            Array of wind directions. Dimensions should be correspond to
+            [time, location]. See documentation for `data_inds` for
+            required spatial mapping of GID values.
+        wind_speeds : 2D np.array
+            Array of wind speeds. Dimensions should be correspond to
+            [time, location]. See documentation for `data_inds` for
+            required spatial mapping of GID values.
+        temps : 2D np.array
+            Array oftemperatures. Dimensions should be correspond to
+            [time, location]. See documentation for `data_inds` for
+            required spatial mapping of GID values.
+        pressures : 2D np.array
+            Array of pressures. Dimensions should be correspond to
             pressures, respectively. Dimensions should be correspond to
             [time, location]. See documentation for `data_inds` for
             required spatial mapping of GID values.
         time_index : 1D np.array
             Time index array corresponding to the temporal dimension of
             the 2D data. Will be exposed directly to user.
-
+        relative_humidities : 2D np.array, optional
+            Array of relative humidities. Dimensions should be
+            correspond to [time, location]. See documentation for
+            `data_inds` for required spatial mapping of GID values.
+            If ``None``, relative_humidities cannot be queried.
         """
+
         self.data_inds = data_inds
         self.wind_dirs = wind_dirs
         self.wind_speeds = wind_speeds
         self.temps = temps
         self.pressures = pressures
         self.time_index = time_index
+        self.relative_humidities = relative_humidities
+        self._humidities_exist = relative_humidities is not None
 
     def __getitem__(self, key):
         dset_name, t_idx, gids = key
@@ -198,6 +232,8 @@ class BespokeSinglePlantData:
             return self.temps[t_idx, data_inds]
         if "pressure" in dset_name:
             return self.pressures[t_idx, data_inds]
+        if self._humidities_exist and "relativehumidity" in dset_name:
+            return self.relative_humidities[t_idx, data_inds]
         msg = f"Unknown dataset name: {dset_name!r}"
         logger.error(msg)
         raise ValueError(msg)
@@ -481,8 +517,7 @@ class BespokeSinglePlant:
         self._pre_loaded_data = pre_loaded_data
         self._outputs = {}
 
-        Handler = self.get_wind_handler(res)
-        res = res if not isinstance(res, str) else Handler(res)
+        res = res if not isinstance(res, str) else MultiYearWindResource(res)
 
         self._sc_point = AggSCPoint(
             gid,
@@ -713,6 +748,7 @@ class BespokeSinglePlant:
             weights[i] = self.sc_point.include_mask_flat[mask].sum()
 
         weights /= weights.sum()
+        data = data.astype(np.float32)
         data *= weights
         data = np.sum(data, axis=1)
 
@@ -898,15 +934,18 @@ class BespokeSinglePlant:
             if np.nanmax(pres) > 1000:
                 pres *= 9.86923e-6
 
-            self._res_df = pd.DataFrame(
-                {
-                    "temperature": temp,
-                    "pressure": pres,
-                    "windspeed": ws,
-                    "winddirection": wd,
-                },
-                index=ti,
-            )
+            data = {
+                "temperature": temp,
+                "pressure": pres,
+                "windspeed": ws,
+                "winddirection": wd,
+            }
+
+            if self.sam_sys_inputs.get("en_icing_cutoff"):
+                rh = self.get_weighted_res_ts("relativehumidity_2m")
+                data["relativehumidity"] = rh
+
+            self._res_df = pd.DataFrame(data, index=ti)
 
             if "time_index_step" in self.original_sam_sys_inputs:
                 ti_step = self.original_sam_sys_inputs["time_index_step"]
@@ -1142,29 +1181,6 @@ class BespokeSinglePlant:
         lcoe_kwargs["capital_cost"] = lcoe_kwargs["capital_cost"] + bos
         return lcoe_kwargs
 
-    @staticmethod
-    def get_wind_handler(res):
-        """Get a wind resource handler for a resource filepath.
-
-        Parameters
-        ----------
-        res : str
-            Resource filepath to wtk .h5 file. Can include * wildcards
-            for multi year resource.
-
-        Returns
-        -------
-        handler : WindResource | MultiYearWindResource
-            Wind resource handler or multi year handler
-        """
-        handler = res
-        if isinstance(res, str):
-            if "*" in res:
-                handler = MultiYearWindResource
-            else:
-                handler = WindResource
-        return handler
-
     @classmethod
     def check_dependencies(cls):
         """Check special dependencies for bespoke"""
@@ -1382,32 +1398,45 @@ class BespokeSinglePlant:
         eos_mult = (self.plant_optimizer.capital_cost
                     / self.plant_optimizer.capacity
                     / baseline_cost)
-        reg_mult = self.sam_sys_inputs.get("capital_cost_multiplier", 1)
+        reg_mult_cc = self.sam_sys_inputs.get(
+            "capital_cost_multiplier", 1)
+        reg_mult_foc = self.sam_sys_inputs.get(
+            "fixed_operating_cost_multiplier", 1)
+        reg_mult_voc = self.sam_sys_inputs.get(
+            "variable_operating_cost_multiplier", 1)
+        reg_mult_bos = self.sam_sys_inputs.get(
+            "balance_of_system_cost_multiplier", 1)
 
         self._meta[SupplyCurveField.EOS_MULT] = eos_mult
-        self._meta[SupplyCurveField.REG_MULT] = reg_mult
+        self._meta[SupplyCurveField.REG_MULT] = reg_mult_cc
 
-        cap_cost = (
-            self.plant_optimizer.capital_cost
-            + self.plant_optimizer.balance_of_system_cost
-        )
         self._meta[SupplyCurveField.COST_SITE_OCC_USD_PER_AC_MW] = (
-            cap_cost / capacity_ac_mw
+            (self.plant_optimizer.capital_cost
+             + self.plant_optimizer.balance_of_system_cost)
+            / capacity_ac_mw
         )
         self._meta[SupplyCurveField.COST_BASE_OCC_USD_PER_AC_MW] = (
-            cap_cost / eos_mult / reg_mult / capacity_ac_mw
+            (self.plant_optimizer.capital_cost / eos_mult / reg_mult_cc
+             + self.plant_optimizer.balance_of_system_cost / reg_mult_bos)
+            / capacity_ac_mw
         )
         self._meta[SupplyCurveField.COST_SITE_FOC_USD_PER_AC_MW] = (
-            self.plant_optimizer.fixed_operating_cost / capacity_ac_mw
+            self.plant_optimizer.fixed_operating_cost
+            / capacity_ac_mw
         )
         self._meta[SupplyCurveField.COST_BASE_FOC_USD_PER_AC_MW] = (
-            self.plant_optimizer.fixed_operating_cost / capacity_ac_mw
+            self.plant_optimizer.fixed_operating_cost
+            / reg_mult_foc
+            / capacity_ac_mw
         )
         self._meta[SupplyCurveField.COST_SITE_VOC_USD_PER_AC_MW] = (
-            self.plant_optimizer.variable_operating_cost / capacity_ac_mw
+            self.plant_optimizer.variable_operating_cost
+            / capacity_ac_mw
         )
         self._meta[SupplyCurveField.COST_BASE_VOC_USD_PER_AC_MW] = (
-            self.plant_optimizer.variable_operating_cost / capacity_ac_mw
+            self.plant_optimizer.variable_operating_cost
+            / reg_mult_voc
+            / capacity_ac_mw
         )
         self._meta[SupplyCurveField.FIXED_CHARGE_RATE] = (
             self.plant_optimizer.fixed_charge_rate
@@ -1489,8 +1518,9 @@ class BespokeWindPlants(BaseAggregation):
                  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,
-                 pre_extract_inclusions=False, prior_run=None, gid_map=None,
-                 bias_correct=None, pre_load_data=False):
+                 pre_extract_inclusions=False, eos_mult_baseline_cap_mw=200,
+                 prior_run=None, gid_map=None, bias_correct=None,
+                 pre_load_data=False):
         """reV bespoke analysis class.
 
         Much like generation, ``reV`` bespoke analysis runs SAM
@@ -1521,14 +1551,15 @@ class BespokeWindPlants(BaseAggregation):
             uniquely defined (i.e.only appear once and in a single
             input file).
         res_fpath : str
-            Filepath to wind resource data in NREL WTK format. This
-            input can be path to a single resource HDF5 file or a path
-            including a wildcard input like ``/h5_dir/prefix*suffix`` to
-            run bespoke on multiple years of resource data. The former
-            must be readable by
-            :py:class:`rex.renewable_resource.WindResource` while the
-            latter must be readable by
-            or :py:class:`rex.multi_year_resource.MultiYearWindResource`
+            Unix shell style path to wind resource HDF5 file in NREL WTK
+            format. Can also be a path including a wildcard input like
+            ``/h5_dir/prefix*suffix`` to run bespoke on multiple years
+            of resource data. Can also be an explicit list of resource
+            HDF5 file paths, which themselves can contain wildcards. If
+            multiple files are specified in this way, they must have the
+            same coordinates but can have different time indices (i.e.
+            different years). This input must be readable by
+            :py:class:`rex.multi_year_resource.MultiYearWindResource`
             (i.e. the resource data conform to the
             `rex data format <https://tinyurl.com/3fy7v5kx>`_). This
             means the data file(s) must contain a 1D ``time_index``
@@ -1855,6 +1886,13 @@ class BespokeWindPlants(BaseAggregation):
             the `excl_dict` input. It is typically faster to compute
             the inclusion mask on the fly with parallel workers.
             By default, ``False``.
+        eos_mult_baseline_cap_mw : int | float, optional
+            Baseline plant capacity (MW) used to calculate economies of
+            scale (EOS) multiplier from the `capital_cost_function`. EOS
+            multiplier is calculated as the $-per-kW of the wind plant
+            divided by the $-per-kW of a plant with this baseline
+            capacity. By default, `200` (MW), which aligns the baseline
+            with ATB assumptions. See here: https://tinyurl.com/y85hnu6h.
         prior_run : str, optional
             Optional filepath to a bespoke output HDF5 file belonging to
             a prior run. If specified, this module will only run the
@@ -1980,6 +2018,7 @@ class BespokeWindPlants(BaseAggregation):
         self._ws_bins = ws_bins
         self._wd_bins = wd_bins
         self._data_layers = data_layers
+        self._eos_mult_baseline_cap_mw = eos_mult_baseline_cap_mw
         self._prior_meta = self._parse_prior_run(prior_run)
         self._gid_map = BespokeSinglePlant._parse_gid_map(gid_map)
         self._bias_correct = Gen._parse_bc(bias_correct)
@@ -2119,8 +2158,7 @@ class BespokeWindPlants(BaseAggregation):
                 )
 
         # just check that this file exists, cannot check res_fpath if *glob
-        Handler = BespokeSinglePlant.get_wind_handler(self._res_fpath)
-        with Handler(self._res_fpath) as f:
+        with MultiYearWindResource(self._res_fpath) as f:
             assert any(f.dsets)
 
     def _pre_load_data(self, pre_load_data):
@@ -2159,7 +2197,10 @@ class BespokeWindPlants(BaseAggregation):
 
         logger.info("Pre-loading resource data for Bespoke run... ")
         self._pre_loaded_data = BespokeMultiPlantData(
-            self._res_fpath, sc_gid_to_hh, sc_gid_to_res_gid
+            self._res_fpath,
+            sc_gid_to_hh,
+            sc_gid_to_res_gid,
+            pre_load_humidity=self._project_points.sam_config_obj.icing,
         )
 
     def _hh_for_sc_gid(self, sc_gid):
@@ -2453,8 +2494,8 @@ class BespokeWindPlants(BaseAggregation):
                    area_filter_kernel='queen', min_area=None,
                    resolution=64, excl_area=0.0081, data_layers=None,
                    gids=None, exclusion_shape=None, slice_lookup=None,
-                   prior_meta=None, gid_map=None, bias_correct=None,
-                   pre_loaded_data=None):
+                   eos_mult_baseline_cap_mw=200, prior_meta=None,
+                   gid_map=None, bias_correct=None, pre_loaded_data=None):
         """
         Standalone serial method to run bespoke optimization.
         See BespokeWindPlants docstring for parameter description.
@@ -2480,14 +2521,13 @@ class BespokeWindPlants(BaseAggregation):
                 exclusion_shape = sc.exclusions.shape
 
         cls._check_inclusion_mask(inclusion_mask, gids, exclusion_shape)
-        Handler = BespokeSinglePlant.get_wind_handler(res_fpath)
 
         # pre-extract handlers so they are not repeatedly initialized
         file_kwargs = {
             "excl_dict": excl_dict,
             "area_filter_kernel": area_filter_kernel,
             "min_area": min_area,
-            "h5_handler": Handler,
+            "h5_handler": MultiYearWindResource,
         }
 
         with AggFileHandler(excl_fpath, res_fpath, **file_kwargs) as fh:
@@ -2520,6 +2560,7 @@ class BespokeWindPlants(BaseAggregation):
                         excl_area=excl_area,
                         data_layers=data_layers,
                         exclusion_shape=exclusion_shape,
+                        eos_mult_baseline_cap_mw=eos_mult_baseline_cap_mw,
                         prior_meta=prior_meta,
                         gid_map=gid_map,
                         bias_correct=bias_correct,
@@ -2612,6 +2653,7 @@ class BespokeWindPlants(BaseAggregation):
                     gids=gid,
                     exclusion_shape=self.shape,
                     slice_lookup=copy.deepcopy(self.slice_lookup),
+                    eos_mult_baseline_cap_mw=self._eos_mult_baseline_cap_mw,
                     prior_meta=self._get_prior_meta(gid),
                     gid_map=self._gid_map,
                     bias_correct=self._get_bc_for_gid(gid),
@@ -2676,6 +2718,7 @@ class BespokeWindPlants(BaseAggregation):
                 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
 
                 si = self.run_serial(self._excl_fpath,
                                      self._res_fpath,
@@ -2700,6 +2743,7 @@ class BespokeWindPlants(BaseAggregation):
                                      excl_area=self._excl_area,
                                      data_layers=self._data_layers,
                                      slice_lookup=slice_lookup,
+                                     eos_mult_baseline_cap_mw=ebc,
                                      prior_meta=prior_meta,
                                      gid_map=self._gid_map,
                                      bias_correct=i_bc,

reV/generation/generation.py

@@ -236,10 +236,10 @@ class Gen(BaseGen):
             info on the allowed and/or required SAM config file inputs.
         resource_file : str
             Filepath to resource data. This input can be path to a
-            single resource HDF5 file, a path to a directory containing
-            data spread across multiple HDF5 files, or a path including
-            a wildcard input like ``/h5_dir/prefix*suffix``. In all
-            cases, the resource data must be readable by
+            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`
             or :py:class:`rex.multi_file_resource.MultiFileResource`.
             (i.e. the resource data conform to the
@@ -253,8 +253,14 @@ class Gen(BaseGen):
             consideration, and its shape must be a multiple of 8760.
 
             .. Note:: If executing ``reV`` from the command line, this
-              path can contain brackets ``{}`` that will be filled in by
-              the `analysis_years` input.
+              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).
 
             .. Important:: If you are using custom resource data (i.e.
               not NSRDB/WTK/Sup3rCC, etc.), ensure the following:

reV/handlers/multi_year.py

@@ -96,15 +96,17 @@ class MultiYearGroup:
         pass_through_dsets : list
             List of pass through datasets.
         """
+        with Resource(self.source_files[0]) as res:
+            all_dsets = res.datasets
+
         if isinstance(dsets, str) and dsets == 'PIPELINE':
-            files = parse_previous_status(self._dirout, ModuleName.MULTI_YEAR)
-            with Resource(files[0]) as res:
-                dsets = res.datasets
+            dsets = all_dsets
 
         if "lcoe_fcr" in dsets:
             for dset in LCOE_REQUIRED_OUTPUTS:
-                if dset not in pass_through_dsets:
+                if dset not in pass_through_dsets and dset in all_dsets:
                     pass_through_dsets.append(dset)
+
         if "dc_ac_ratio" in dsets:
             if "dc_ac_ratio" not in pass_through_dsets:
                 pass_through_dsets.append("dc_ac_ratio")
@@ -839,11 +841,6 @@ def my_collect_groups(out_fpath, groups, clobber=True):
                                         dset, group=group['group'])
 
         pass_through_dsets = group.get('pass_through_dsets') or []
-        if "lcoe_fcr" in group['dsets']:
-            for dset in LCOE_REQUIRED_OUTPUTS:
-                if dset not in pass_through_dsets:
-                    pass_through_dsets.append(dset)
-
         for dset in pass_through_dsets:
             MultiYear.pass_through(out_fpath, group['source_files'],
                                    dset, group=group['group'])

reV/supply_curve/cli_sc_aggregation.py

@@ -50,12 +50,25 @@ def _preprocessor(config, out_dir):
 def _format_res_fpath(config):
     """Format res_fpath with year, if need be. """
     res_fpath = config.setdefault("res_fpath", None)
-    if isinstance(res_fpath, str) and '{}' in res_fpath:
-        for year in range(1998, 2018):
-            if os.path.exists(res_fpath.format(year)):
-                break
-
-        config["res_fpath"] = res_fpath.format(year)
+    if isinstance(res_fpath, str):
+        if '{}' in res_fpath:
+            for year in range(1950, 2100):
+                if os.path.exists(res_fpath.format(year)):
+                    break
+            else:
+                msg = ("Could not find any files that match the pattern"
+                       "{!r}".format(res_fpath.format("<year>")))
+                logger.error(msg)
+                raise FileNotFoundError(msg)
+
+            res_fpath = res_fpath.format(year)
+
+        elif not os.path.exists(res_fpath):
+            msg = "Could not find resource file: {!r}".format(res_fpath)
+            logger.error(msg)
+            raise FileNotFoundError(msg)
+
+        config["res_fpath"] = res_fpath
 
     return config
 

reV/supply_curve/sc_aggregation.py

@@ -18,7 +18,6 @@ from rex.multi_file_resource import MultiFileResource
 from rex.resource import Resource
 from rex.utilities.execution import SpawnProcessPool
 
-from reV.generation.base import BaseGen
 from reV.handlers.exclusions import ExclusionLayers
 from reV.supply_curve.aggregation import (
     AbstractAggFileHandler,
@@ -1410,7 +1409,7 @@ class SupplyCurveAggregation(BaseAggregation):
               ``multi-year``, ``collect``, or ``econ``. However, note
               that duplicate executions of any of these commands within
               the pipeline may invalidate this parsing, meaning the
-              `econ_fpath` input will have to be specified manually.
+              `gen_fpath` input will have to be specified manually.
 
             By default, ``None``.
         args : tuple | list, optional

reV/supply_curve/tech_mapping.py

@@ -185,7 +185,7 @@ class TechMapping:
                          excl_row_slices, excl_col_slices,
                          coord_labels=(LATITUDE, LONGITUDE)):
         """
-        Extract the exclusion coordinates for teh desired gids for TechMapping.
+        Extract the exclusion coordinates for the desired gids for TechMapping.
 
         Parameters
         ----------

reV/version.py

@@ -2,4 +2,4 @@
 reV Version number
 """
 
-__version__ = "0.9.2"
+__version__ = "0.9.5"