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

{NREL_reV-0.9.0.dist-info → NREL_reV-0.9.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NREL-reV
-Version: 0.9.0
+Version: 0.9.4
 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.0.dist-info → NREL_reV-0.9.4.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=1L_LIr61Neb0VTgrPuHWPOXmcvf03SLALTnnaozT9Gs,50
-reV/SAM/SAM.py,sha256=KZ5EmHv2Uhoxh3xSDWYm7RmwMw-M7hfsh7P_qY-Shc8,31628
+reV/version.py,sha256=yGiTX3S7R3_KR7tg1ywY2A7vCKmVDUNzRXtyt803-Ds,50
+reV/SAM/SAM.py,sha256=wdrL7EAbn6246_3NP6EIksLM2yIg4IKK4taaTA7oj5o,32130
 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=_kDNC4ZJ_i9TUw8Tt2GdxgGqZ1hUrEe25WPr_SUas0Q,87542
+reV/SAM/generation.py,sha256=WYFXb39v7gJp1xxyLtsMLrP8Ze9dB15cxqxRoeNdZyk,89144
 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=22WO3APF5Tq20oifmQzrV-08amEyOmLjGZjLHsXezOU,110323
+reV/bespoke/bespoke.py,sha256=vvCyCaJc333yifTqQvGb-nV7OPen3fhpUE6vecelU78,111283
 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
@@ -31,13 +31,13 @@ reV/config/project_points.py,sha256=NmIj7hQm4qSMBqgefZDRNot2B8APCDk0ynTwegk-1Go,
 reV/config/sam_config.py,sha256=xvvx2FTuliq0Sk-BjRE3I9zdDmIdwHVBnWtXCcsoc40,7998
 reV/econ/__init__.py,sha256=UId1LNaAP9lErCEXVce6JZf0qVRUvwNFOPrajdRevGo,130
 reV/econ/cli_econ.py,sha256=2KNy3JQD0EKjStaoD2r6nv3ELFw88h2E_up-UKj_sfE,4286
-reV/econ/econ.py,sha256=_sfUhtodY0auz1yROFCFPxUu3GUV_HvwwBo1uzOrnks,22982
-reV/econ/economies_of_scale.py,sha256=Hac0M5_HgYm3HmfAcHIiq0flLAJjVK-wJuyu_DDH5Gs,10634
+reV/econ/econ.py,sha256=edsNPZg2amhC_GZeotkY2MU3u17NgWeCpS6okZNrwAA,23637
+reV/econ/economies_of_scale.py,sha256=GfM0vj4LnwsthzhSsUnmLt78PAUHrxZI5ghWaxvoF7A,10568
 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=WOclf4DzSy4qKpRCy4RUmnh7rkcLBcutH8NmQl9T2CQ,46367
+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=4U-9nMVeKs03jIKdyeLq5FM9uQqAuYcgheAyMyWa5tg,30825
 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=0yMaxfvDW-EDMRcEMNKK5r1wdUbboR2iVVqe8DgTT0I,85944
-reV/supply_curve/sc_aggregation.py,sha256=6kJg4CaLlFAC196azbfzA-T_wXkXSwNDQKOW-k2lqcE,61645
-reV/supply_curve/supply_curve.py,sha256=i_Wo5cI11hNt5zfGZiqqBNM4_qERD1dVNmud1tWJteI,69942
-reV/supply_curve/tech_mapping.py,sha256=7him2R-8kpigI47ATSN4ncnvzuF_AzeXyrtz_jmzLug,18573
+reV/supply_curve/points.py,sha256=YEYHpn3KlBbGqpxywrfbrUrlhL3BndgX7cVQerdB6zg,86107
+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=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.0.dist-info/LICENSE,sha256=hDwoTANtan2ZpufBlXm5C3W_PJ-mCqItvlcobgjxL7k,1526
-NREL_reV-0.9.0.dist-info/METADATA,sha256=hkdHRfdqhgSf-YxHU7lZss4kgeJE5fYVfWWDHpK7FRQ,10294
-NREL_reV-0.9.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-NREL_reV-0.9.0.dist-info/entry_points.txt,sha256=KGtPEOQRZMSqKXjjv5jt_T4e4HQN0fHiaGdAWwTtuW4,617
-NREL_reV-0.9.0.dist-info/top_level.txt,sha256=S6YF2ZYgXUB6n28SY0K2H8YB9tMJdXQ9CyQbo6VC89M,4
-NREL_reV-0.9.0.dist-info/RECORD,,
+NREL_reV-0.9.4.dist-info/LICENSE,sha256=hDwoTANtan2ZpufBlXm5C3W_PJ-mCqItvlcobgjxL7k,1526
+NREL_reV-0.9.4.dist-info/METADATA,sha256=IN6FHUL4PezUaGzk6bmUM-0fF1Ux2HGNQoXumrFo4Lg,10279
+NREL_reV-0.9.4.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+NREL_reV-0.9.4.dist-info/entry_points.txt,sha256=KGtPEOQRZMSqKXjjv5jt_T4e4HQN0fHiaGdAWwTtuW4,617
+NREL_reV-0.9.4.dist-info/top_level.txt,sha256=S6YF2ZYgXUB6n28SY0K2H8YB9tMJdXQ9CyQbo6VC89M,4
+NREL_reV-0.9.4.dist-info/RECORD,,

{NREL_reV-0.9.0.dist-info → NREL_reV-0.9.4.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,)
 
@@ -950,4 +955,12 @@ def _add_sys_capacity(sam_inputs):
         if cap is not None:
             cap = max(cap)
 
+    if cap is None:
+        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

@@ -233,6 +233,15 @@ class AbstractSamGeneration(RevPySam, ScheduledLossesMixin, ABC):
             logger.error(msg)
             raise InputError(msg)
 
+        if len(resource) < 8760:
+            msg = (f"Detected resource time series of length {len(resource)}, "
+                   "which is less than 8760. This may yield unexpected "
+                   "results or fail altogether. If this is not intentional, "
+                   "try setting 'time_index_step: 1' in your SAM config or "
+                   "double check the resource input you're using.")
+            logger.warning(msg)
+            warn(msg)
+
     @abstractmethod
     def set_resource_data(self, resource, meta):
         """Placeholder for resource data setting (nsrdb or wtk)"""
@@ -1539,7 +1548,7 @@ class Geothermal(AbstractSamGenerationFromWeatherFile):
           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:
+          ``reV`` under the following conditions:
 
               - The design temperature is larger than the resource
                 temperature
@@ -1786,6 +1795,10 @@ class Geothermal(AbstractSamGenerationFromWeatherFile):
                 "{}".format(self.sam_sys_inputs["nameplate"])
             )
             logger.info(msg)
+            # required for downstream LCOE calcs
+            self.sam_sys_inputs["system_capacity"] = (
+                self.sam_sys_inputs["nameplate"]
+            )
             return
 
         val = set(resource["potential_MW"].unique())
@@ -1801,6 +1814,8 @@ class Geothermal(AbstractSamGenerationFromWeatherFile):
 
         logger.debug("Setting the nameplate to {}".format(val))
         self.sam_sys_inputs["nameplate"] = val
+        # required for downstream LCOE calcs
+        self.sam_sys_inputs["system_capacity"] = val
 
     def _set_resource_potential_to_match_gross_output(self):
         """Set the resource potential input to match the gross generation.
@@ -1861,7 +1876,9 @@ class Geothermal(AbstractSamGenerationFromWeatherFile):
             logger.debug(
                 "Setting the capital_cost to ${:,.2f}".format(capital_cost)
             )
-            self.sam_sys_inputs["capital_cost"] = capital_cost
+            reg_mult = self.sam_sys_inputs.get("capital_cost_multiplier", 1)
+            self.sam_sys_inputs["base_capital_cost"] = capital_cost
+            self.sam_sys_inputs["capital_cost"] = capital_cost * reg_mult
 
         dc_per_well = self.sam_sys_inputs.pop("drill_cost_per_well", None)
         num_wells = self.sam_sys_inputs.pop(
@@ -1884,19 +1901,35 @@ class Geothermal(AbstractSamGenerationFromWeatherFile):
                         drill_cost, num_wells, dc_per_well
                     )
                 )
-                self.sam_sys_inputs["capital_cost"] = capital_cost + drill_cost
+                reg_mult = self.sam_sys_inputs.get(
+                    "capital_cost_multiplier", 1
+                )
+                base_cc = capital_cost / reg_mult
+                new_base_cc = base_cc + drill_cost
+                self.sam_sys_inputs["base_capital_cost"] = new_base_cc
+                self.sam_sys_inputs["capital_cost"] = new_base_cc * reg_mult
 
         foc_per_kw = self.sam_sys_inputs.pop(
             "fixed_operating_cost_per_kw", None
         )
         if foc_per_kw is not None:
-            fixed_operating_cost = foc_per_kw * plant_size_kw
+            foc = foc_per_kw * plant_size_kw
             logger.debug(
-                "Setting the fixed_operating_cost to ${:,.2f}".format(
-                    capital_cost
-                )
+                "Setting the fixed_operating_cost to ${:,.2f}".format(foc)
+            )
+            self.sam_sys_inputs["base_fixed_operating_cost"] = foc
+            self.sam_sys_inputs["fixed_operating_cost"] = foc
+
+        voc_per_kw = self.sam_sys_inputs.pop(
+            "variable_operating_cost_per_kw", None
+        )
+        if voc_per_kw is not None:
+            voc = voc_per_kw * plant_size_kw
+            logger.debug(
+                "Setting the variable_operating_cost to ${:,.2f}".format(voc)
             )
-            self.sam_sys_inputs["fixed_operating_cost"] = fixed_operating_cost
+            self.sam_sys_inputs["base_variable_operating_cost"] = voc
+            self.sam_sys_inputs["variable_operating_cost"] = voc
 
     def _create_pysam_wfile(self, resource, meta):
         """Create PySAM weather input file.

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
@@ -60,8 +59,13 @@ class 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,7 +73,7 @@ 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`.
         """
         self.res_fpath = res_fpath
@@ -95,12 +99,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()
@@ -481,8 +480,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,
@@ -1142,29 +1140,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"""
@@ -1263,10 +1238,10 @@ class BespokeSinglePlant:
         self._outputs.update(means)
 
         self._meta[SupplyCurveField.MEAN_RES] = self.res_df["windspeed"].mean()
-        self._meta[SupplyCurveField.MEAN_CF_DC] = None
-        self._meta[SupplyCurveField.MEAN_CF_AC] = None
-        self._meta[SupplyCurveField.MEAN_LCOE] = None
-        self._meta[SupplyCurveField.SC_POINT_ANNUAL_ENERGY_MW] = None
+        self._meta[SupplyCurveField.MEAN_CF_DC] = np.nan
+        self._meta[SupplyCurveField.MEAN_CF_AC] = np.nan
+        self._meta[SupplyCurveField.MEAN_LCOE] = np.nan
+        self._meta[SupplyCurveField.SC_POINT_ANNUAL_ENERGY_MW] = np.nan
         # copy dataset outputs to meta data for supply curve table summary
         if "cf_mean-means" in self.outputs:
             self._meta.loc[:, SupplyCurveField.MEAN_CF_AC] = self.outputs[
@@ -1373,7 +1348,7 @@ class BespokeSinglePlant:
         # convert SAM system capacity in kW to reV supply curve cap in MW
         capacity_ac_mw = system_capacity_kw / 1e3
         self._meta[SupplyCurveField.CAPACITY_AC_MW] = capacity_ac_mw
-        self._meta[SupplyCurveField.CAPACITY_DC_MW] = None
+        self._meta[SupplyCurveField.CAPACITY_DC_MW] = np.nan
 
         # add required ReEDS multipliers to meta
         baseline_cost = self.plant_optimizer.capital_cost_per_kw(
@@ -1382,32 +1357,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 +1477,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 +1510,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``
@@ -1618,7 +1608,7 @@ class BespokeWindPlants(BaseAggregation):
             multiple sites can be specified to evaluate ``reV`` at
             multiple specific locations. A string pointing to a project
             points CSV file may also be specified. Typically, the CSV
-            contains two columns:
+            contains the following columns:
 
                 - ``gid``: Integer specifying the supply curve GID of
                   each site.
@@ -1635,7 +1625,7 @@ class BespokeWindPlants(BaseAggregation):
             site-specific capital cost value for each location). Columns
             that do not correspond to a config key may also be included,
             but they will be ignored. The CSV file input can also have
-            these extra columns:
+            these extra, optional columns:
 
                 - ``capital_cost_multiplier``
                 - ``fixed_operating_cost_multiplier``
@@ -1855,6 +1845,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 +1977,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 +2117,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):
@@ -2453,8 +2450,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 +2477,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 +2516,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 +2609,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 +2674,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 +2699,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/econ/econ.py

@@ -76,25 +76,36 @@ class Econ(BaseGen):
             (or slice) representing the GIDs of multiple sites can be
             specified to evaluate reV at multiple specific locations.
             A string pointing to a project points CSV file may also be
-            specified. Typically, the CSV contains two columns:
+            specified. Typically, the CSV contains the following
+            columns:
 
-                - ``gid``: Integer specifying the GID of each site.
+                - ``gid``: Integer specifying the generation GID of each
+                  site.
                 - ``config``: Key in 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.
-
-            The CSV file may also contain site-specific inputs by
+                - ``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
+                  config. If you include this column in your CSV, you
+                  *do not* need to specify ``capital_cost``, unless you
+                  would like that value to vary regionally and
+                  independently of the multiplier (i.e. the multiplier
+                  will still be applied on top of the ``capital_cost``
+                  input).
+
+            The CSV file may also contain other site-specific inputs by
             including a column named after a config keyword (e.g. a
-            column called ``capital_cost`` may be included to specify a
-            site-specific capital cost value for each location). Columns
-            that do not correspond to a config key may also be included,
-            but they will be ignored. A DataFrame following the same
-            guidelines as the CSV input (or a dictionary that can be
-            used to initialize such a DataFrame) may be used for this
-            input as well.
+            column called ``wind_turbine_rotor_diameter`` may be
+            included to specify a site-specific turbine diameter for
+            each location). Columns that do not correspond to a config
+            key may also be included, but they will be ignored. A
+            DataFrame following the same guidelines as the CSV input
+            (or a dictionary that can be used to initialize such a
+            DataFrame) may be used for this input as well.
         sam_files : dict | str
             A dictionary mapping SAM input configuration ID(s) to SAM
             configuration(s). Keys are the SAM config ID(s) which

reV/econ/economies_of_scale.py

@@ -212,11 +212,7 @@ class EconomiesOfScale:
         if cost_per_mw is None:
             return None
 
-        cost = cap * cost_per_mw
-        if cost > 0:
-            return cost
-
-        return None
+        return cap * cost_per_mw
 
     @property
     def raw_capital_cost(self):
@@ -278,7 +274,7 @@ class EconomiesOfScale:
             Fixed operating cost from input data arg
         """
         foc_from_cap = self._cost_from_cap(
-            SupplyCurveField.COST_BASE_FOC_USD_PER_AC_MW
+            SupplyCurveField.COST_SITE_FOC_USD_PER_AC_MW
         )
         if foc_from_cap is not None:
             return foc_from_cap
@@ -297,7 +293,7 @@ class EconomiesOfScale:
             Variable operating cost from input data arg
         """
         voc_from_cap = self._cost_from_cap(
-            SupplyCurveField.COST_BASE_VOC_USD_PER_AC_MW
+            SupplyCurveField.COST_SITE_VOC_USD_PER_AC_MW
         )
         if voc_from_cap is not None:
             return voc_from_cap

reV/generation/generation.py

@@ -171,7 +171,7 @@ class Gen(BaseGen):
             multiple sites can be specified to evaluate reV at multiple
             specific locations. A string pointing to a project points
             CSV file may also be specified. Typically, the CSV contains
-            two columns:
+            the following columns:
 
                 - ``gid``: Integer specifying the generation GID of each
                   site.
@@ -181,16 +181,25 @@ class Gen(BaseGen):
                   ``None`` (or left out completely) if you specify only
                   a single SAM configuration file as the `sam_files`
                   input.
-
-            The CSV file may also contain site-specific inputs by
+                - ``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
+                  config. If you include this column in your CSV, you
+                  *do not* need to specify ``capital_cost``, unless you
+                  would like that value to vary regionally and
+                  independently of the multiplier (i.e. the multiplier
+                  will still be applied on top of the ``capital_cost``
+                  input).
+
+            The CSV file may also contain other site-specific inputs by
             including a column named after a config keyword (e.g. a
-            column called ``capital_cost`` may be included to specify a
-            site-specific capital cost value for each location). Columns
-            that do not correspond to a config key may also be included,
-            but they will be ignored. A DataFrame following the same
-            guidelines as the CSV input (or a dictionary that can be
-            used to initialize such a DataFrame) may be used for this
-            input as well.
+            column called ``wind_turbine_rotor_diameter`` may be
+            included to specify a site-specific turbine diameter for
+            each location). Columns that do not correspond to a config
+            key may also be included, but they will be ignored. A
+            DataFrame following the same guidelines as the CSV input
+            (or a dictionary that can be used to initialize such a
+            DataFrame) may be used for this input as well.
 
             .. Note:: By default, the generation GID of each site is
               assumed to match the resource GID to be evaluated for that
@@ -227,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
@@ -244,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

@@ -103,8 +103,9 @@ class MultiYearGroup:
 
         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 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 +840,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/points.py

@@ -2188,10 +2188,10 @@ class GenerationSupplyCurvePoint(AggregationSupplyCurvePoint):
     def _compute_cost_per_ac_mw(self, dset):
         """Compute a cost per AC MW for a given input. """
         if self._sam_system_capacity <= 0:
-            return 0
+            return None
 
         if dset not in self.gen.datasets:
-            return 0
+            return None
 
         sam_cost = self.exclusion_weighted_mean(self.gen[dset])
         sam_cost_per_mw = sam_cost / self._sam_system_capacity
@@ -2391,10 +2391,11 @@ class GenerationSupplyCurvePoint(AggregationSupplyCurvePoint):
         summary[SupplyCurveField.RAW_LCOE] = eos.raw_lcoe
         summary[SupplyCurveField.MEAN_LCOE] = eos.scaled_lcoe
         summary[SupplyCurveField.EOS_MULT] = eos.capital_cost_scalar
-        summary[SupplyCurveField.COST_SITE_OCC_USD_PER_AC_MW] = (
-            summary[SupplyCurveField.COST_SITE_OCC_USD_PER_AC_MW]
-            * summary[SupplyCurveField.EOS_MULT]
-        )
+        cost = summary[SupplyCurveField.COST_SITE_OCC_USD_PER_AC_MW]
+        if cost is not None:
+            summary[SupplyCurveField.COST_SITE_OCC_USD_PER_AC_MW] = (
+                cost * summary[SupplyCurveField.EOS_MULT]
+            )
         return summary
 
     @classmethod
@@ -2537,6 +2538,10 @@ class GenerationSupplyCurvePoint(AggregationSupplyCurvePoint):
             if cap_cost_scale is not None:
                 summary = point.economies_of_scale(cap_cost_scale, summary)
 
+        for arg, val in summary.items():
+            if val is None:
+                summary[arg] = np.nan
+
         return summary
 
 

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/supply_curve.py

@@ -1116,8 +1116,7 @@ class SupplyCurve:
 
         return table
 
-    # pylint: disable=C901
-    def _full_sort(
+    def _full_sort(  # noqa: C901
         self,
         trans_table,
         trans_costs=None,
@@ -1289,7 +1288,7 @@ class SupplyCurve:
 
         for col in _REQUIRED_OUTPUT_COLS:
             if col not in self._trans_table:
-                self._trans_table[col] = None
+                self._trans_table[col] = np.nan
             if col not in columns:
                 columns.append(col)
 

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.0"
+__version__ = "0.9.4"