NREL-reV 0.14.0__py3-none-any.whl → 0.14.2__py3-none-any.whl

{nrel_rev-0.14.0.dist-info → nrel_rev-0.14.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: NREL-reV
-Version: 0.14.0
+Version: 0.14.2
 Summary: National Renewable Energy Laboratory's (NREL's) Renewable Energy Potential(V) Model: reV
 Author-email: Galen Maclaurin <galen.maclaurin@nrel.gov>
 Maintainer-email: Grant Buster <gbuster@nrel.gov>, Paul Pinchuk <ppinchuk@nrel.gov>
@@ -23,7 +23,7 @@ License-File: LICENSE
 Requires-Dist: NREL-gaps<0.9,>=0.8.0
 Requires-Dist: NREL-NRWAL<0.1,>=0.0.11
 Requires-Dist: NREL-PySAM~=7.0.0
-Requires-Dist: NREL-rex<0.4,>=0.3.2
+Requires-Dist: NREL-rex<0.4,>=0.3.5
 Requires-Dist: numpy<3,>=2.0.2
 Requires-Dist: packaging<25,>=24.2
 Requires-Dist: plotly<7,>=6.0.1

{nrel_rev-0.14.0.dist-info → nrel_rev-0.14.2.dist-info}/RECORD

@@ -1,13 +1,13 @@
-nrel_rev-0.14.0.dist-info/licenses/LICENSE,sha256=hDwoTANtan2ZpufBlXm5C3W_PJ-mCqItvlcobgjxL7k,1526
+nrel_rev-0.14.2.dist-info/licenses/LICENSE,sha256=hDwoTANtan2ZpufBlXm5C3W_PJ-mCqItvlcobgjxL7k,1526
 reV/__init__.py,sha256=tXTpWu_qVo3uotfSw_TJ-gNbidGaIPPfUTwBlpCMJ-g,856
 reV/cli.py,sha256=u7G5M5moA7q8fCgC_1MB30Z7R14GNcngVf6eVNkfQU8,1682
-reV/version.py,sha256=MW2Xrj6zWXWLE73quVP27irsAbTU85t5oflVIQzGMVE,51
+reV/version.py,sha256=iZ2NEm6j_ZMkwjscuehf0I9OUwsEHrSS3xbfjV9LCbM,51
 reV/SAM/SAM.py,sha256=3NK9rRaJzqH6wz7CU_5XguKCRhmoilOpDdFFsFgOaxQ,33163
 reV/SAM/__init__.py,sha256=LJqoncyKDY5ZP5WA4kboh561bce11F9Ge645Izah0EY,240
 reV/SAM/defaults.py,sha256=JQMJomX7wsbMzxKjx_IMnA_9QFsV2yWCyl_JToDVSJo,6703
 reV/SAM/econ.py,sha256=dFhtUXp5eozSsPyk0XXji0HGexKJnxoct8cwE1ApHVg,20704
 reV/SAM/generation.py,sha256=kbDiQ0a0VCrfPi6P1RSMKdjlbxuO3rgiR0-YSM1pyU8,85653
-reV/SAM/version_checker.py,sha256=q-eXsmSB08A5hSelNH7uAe_bqPpqjsxaiS3OBjXBs-0,3997
+reV/SAM/version_checker.py,sha256=MBSPqHYmTyjXJLi1ziJ1sGS18AH9an-PZRcl-6IPJGw,3963
 reV/SAM/windbos.py,sha256=fnq1uxtSl-vtJth0gTlHkCSsmvDbRROCo9RGdqA7hK4,7504
 reV/SAM/defaults/USA AZ Phoenix Sky Harbor Intl Ap (TMY3).csv,sha256=8QorTX0ACjgPgNV7kLSpTHOqfY4E17gkkpKB-qseiFk,406896
 reV/SAM/defaults/USA CA Daggett (TMY2).csv,sha256=vVP-mk_cXj1GRHMbqsyZ60fTVMywTappzwp5-ILurFs,410050
@@ -16,7 +16,7 @@ reV/SAM/defaults/WY Southern-Flat Lands.srw,sha256=oSlFI7nnycW7SMnTXEXBXYkoh8rhV
 reV/SAM/defaults/geothermal.json,sha256=gnlxOBxxkbDDacIw6B9yP9iRkfmwj0WTWs8Zb71ytCo,7119
 reV/SAM/defaults/i_pvwattsv5.json,sha256=sF8rSe1bcqsKLXchvRxlp25dXOVe_q7rPJTf_vWR20Y,312
 reV/bespoke/__init__.py,sha256=vpXbyBUrUsTgK8UP_LafMjLiDg2CRG9WZLHPsOJoxek,109
-reV/bespoke/bespoke.py,sha256=573mIoJx8HXq5RH8HufjIhX20XjMJZbbR1kDGKpMzSw,112723
+reV/bespoke/bespoke.py,sha256=ZMl4kz9oAaXpZaNa5EgiD43RvKiKl3xymRv-z4lDYmQ,113169
 reV/bespoke/cli_bespoke.py,sha256=b6Xu0GKpXqPX3qVJ6-z0FrO97uCsH_1dVOa4r6IvesQ,2911
 reV/bespoke/gradient_free.py,sha256=URWV1yiO2jyWk3_GOpfpLV_wlgJhXXGmTUwCB3WTV0Y,12015
 reV/bespoke/pack_turbs.py,sha256=Dcd9F8obF8LPztzeycB5kxa5hXKSCiz3jC1WeAFUx28,3508
@@ -28,7 +28,7 @@ reV/config/cli_project_points.py,sha256=6edOlLNOG-ZEbcpNS2MPfu-DXjcOTEh_MEvKOvQS
 reV/config/curtailment.py,sha256=1bH7xzxOmD4PwLKcXFNotMAa9iCfGBUm2DKTOXViCJg,5548
 reV/config/execution.py,sha256=hyf8W7XYUXE6tXBXs-4En7h_aDTYu8FzbslgBsKLJkQ,5046
 reV/config/output_request.py,sha256=Sj3L5hcypLTCtLnKAqS7GSaI4_Hpb28QLuWT9IMCvrc,4520
-reV/config/project_points.py,sha256=5cY-vMXlGfgjpUDf1OeVLuUJXXXwis365JdOaclMqoY,41740
+reV/config/project_points.py,sha256=CSq7lHgWfJ1pq1XlWJ5eykmGGhumkxVcg__Ln9RR4-Y,41886
 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
@@ -74,17 +74,17 @@ reV/rep_profiles/__init__.py,sha256=v6YZk7tGLpw5gnSckjOn22xazTnv10siCFfWQl9H_fQ,
 reV/rep_profiles/cli_rep_profiles.py,sha256=i3fRolT7HTzTQePXpNLDyxwgpRa7FEfHO1mOqiSufK4,4613
 reV/rep_profiles/rep_profiles.py,sha256=dJ2jcklbelYYNS3IUXIYHg8E0poXLOWrwdqeBBnqYIE,48271
 reV/supply_curve/__init__.py,sha256=dbf0cO0qmt1VhV8dnDddztrcpnwua9T2HBhM6tLKaP8,274
-reV/supply_curve/aggregation.py,sha256=dnnuDG9BEGEgY17uA8nSF3s6L6Q6Lxe94aS7AIKSlm0,40471
-reV/supply_curve/cli_sc_aggregation.py,sha256=qGfJyZjg4tFARG2dl-wAlHv9KjEp2u4wg1Boxz18Gf0,3347
+reV/supply_curve/aggregation.py,sha256=DvIUmj0PbZ8NxgOSmpXvzn9wJnOiQO2Xm2w_WCRVK-U,40908
+reV/supply_curve/cli_sc_aggregation.py,sha256=iDBHlUUPg-Ce4N4Rqb4scn8A_Ygq2q4i9v_ypbH-krs,3387
 reV/supply_curve/cli_supply_curve.py,sha256=e-XrHQIe4OqWTL6u-TUAyHrw7Alk7vkXQ2HoLbE3zTM,2163
-reV/supply_curve/cli_tech_mapping.py,sha256=ztNJhgk3WlSD5Gn7Rh3qBLMvX_pFkjuQT7qUK4s0P2w,1731
+reV/supply_curve/cli_tech_mapping.py,sha256=Dirn4JOmu_3BIP7WgcRLAepsreKqmDhChHLPEUqcDAo,1735
 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=tWL_9hO5xBzDygk9TfDGotSTOgLNp9hEY7-2DJ01TrI,93336
-reV/supply_curve/sc_aggregation.py,sha256=0rxNPJgaK1eilSeRVF-IBRVAqE0UcM8gKo_SkLHdZl0,67738
+reV/supply_curve/points.py,sha256=p9Kqzas1jX8uCXcvYX7o6mdUVsgeHCC_F9pjBaEypPI,93548
+reV/supply_curve/sc_aggregation.py,sha256=l7uXs-grLb0enblPNsEDKccSP11WZ2Pah5baWtgtvzE,68067
 reV/supply_curve/supply_curve.py,sha256=9zhAA_9XSxE18j1Z9FuC71Wr3I0VuakfR5mt1_gHYuU,69931
-reV/supply_curve/tech_mapping.py,sha256=JAinwbh6UPzBX2qwf0EBDDYCanEfe-F6RgiE23oNBcU,18149
+reV/supply_curve/tech_mapping.py,sha256=WP-o5Sk5q1Jz_F9Rpe77_fvTYGH8R4GnYDfRMSTuHB8,17804
 reV/utilities/__init__.py,sha256=HVb1P-ee-z2P6UTjyc0s0gYFK7XYM71BQLEMxj26apA,10834
 reV/utilities/_clean_readme.py,sha256=IFI9wGPX5nnLTNVLJzH8IOHq9unQlAlHRu4Namib0LA,709
 reV/utilities/cli_functions.py,sha256=1_T_sXz0Ct8lW-vOk3mMRcpD6NYsc9cGI7dEujIi9z4,3864
@@ -92,8 +92,8 @@ reV/utilities/curtailment.py,sha256=As902-2aLGnCiVEutYfAFIOwuV--_rCQhxGNOY9RB-4,
 reV/utilities/exceptions.py,sha256=f7sRGsbFLpmL6Caq_H1cD4GfVhnLMyvYUsLPA1UVDDE,3974
 reV/utilities/pytest_utils.py,sha256=spCw9yQ8KEYOkQZpCi9IEmaWIvIqHqbUPDXXNQJJ68U,3241
 reV/utilities/slots.py,sha256=xsw-JuUVZ0YeoCNuwP_HxGNxFMA4xRs1tuImXHIJqaU,2618
-nrel_rev-0.14.0.dist-info/METADATA,sha256=wZN_Wb9S2ZCiKDgYXrPAmEiywSA_-1o12-anLqwQvHs,10733
-nrel_rev-0.14.0.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-nrel_rev-0.14.0.dist-info/entry_points.txt,sha256=4IfJtZm2iMJwrbC8J0Or7VjZWnFpvCaHYVpvSWfIwDA,616
-nrel_rev-0.14.0.dist-info/top_level.txt,sha256=S6YF2ZYgXUB6n28SY0K2H8YB9tMJdXQ9CyQbo6VC89M,4
-nrel_rev-0.14.0.dist-info/RECORD,,
+nrel_rev-0.14.2.dist-info/METADATA,sha256=lIgkZ3PQLu5YOtLYAP62nRtNVAhxkwRuHGqS_2mSwDY,10733
+nrel_rev-0.14.2.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+nrel_rev-0.14.2.dist-info/entry_points.txt,sha256=4IfJtZm2iMJwrbC8J0Or7VjZWnFpvCaHYVpvSWfIwDA,616
+nrel_rev-0.14.2.dist-info/top_level.txt,sha256=S6YF2ZYgXUB6n28SY0K2H8YB9tMJdXQ9CyQbo6VC89M,4
+nrel_rev-0.14.2.dist-info/RECORD,,

{nrel_rev-0.14.0.dist-info → nrel_rev-0.14.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

reV/SAM/version_checker.py

@@ -6,8 +6,9 @@ Created on Mon Feb  3 14:40:42 2020
 @author: gbuster
 """
 import logging
+import importlib
 from warnings import warn
-from pkg_resources import get_distribution
+
 from packaging import version
 from reV.utilities.exceptions import PySAMVersionError, PySAMVersionWarning
 
@@ -105,7 +106,7 @@ class PySamVersionChecker:
     @property
     def pysam_version(self):
         """Get the PySAM distribution version"""
-        return str(get_distribution('nrel-pysam')).split(' ')[1]
+        return importlib.metadata.version("nrel-pysam")
 
     @classmethod
     def run(cls, tech, parameters):

reV/bespoke/bespoke.py

@@ -23,7 +23,7 @@ from rex.multi_year_resource import MultiYearWindResource
 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
-from rex.utilities.utilities import parse_year
+from rex.utilities.utilities import parse_year, check_res_file
 
 from reV.config.output_request import SAMOutputRequest
 from reV.econ.utilities import lcoe_fcr
@@ -80,7 +80,8 @@ class BespokeMultiPlantData:
             Option to pre-load relative humidity data (useful for icing
             runs). If ``False``, relative humidities are not loaded.
         """
-        self.res_fpath = res_fpath
+        self.res_fpath = ([res_fpath]
+                          if isinstance(res_fpath, str) else res_fpath)
         self.sc_gid_to_hh = sc_gid_to_hh
         self.sc_gid_to_res_gid = sc_gid_to_res_gid
         self.hh_to_res_gids = {}
@@ -104,8 +105,9 @@ class BespokeMultiPlantData:
             hh: sorted(gids) for hh, gids in self.hh_to_res_gids.items()
         }
 
+        hsds = all(check_res_file(fp)[1] for fp in self.res_fpath)
         start_time = time.time()
-        with MultiYearWindResource(self.res_fpath) as res:
+        with MultiYearWindResource(self.res_fpath, hsds=hsds) as res:
             self._wind_dirs = {
                 hh: res[f"winddirection_{hh}m", :, gids]
                 for hh, gids in self.hh_to_res_gids.items()
@@ -488,7 +490,9 @@ class BespokeSinglePlant:
         self._pre_loaded_data = pre_loaded_data
         self._outputs = {}
 
-        res = res if not isinstance(res, str) else MultiYearWindResource(res)
+        if isinstance(res, str):
+            __, hsds = check_res_file(res)
+            res = MultiYearWindResource(res, hsds=hsds)
 
         self._sc_point = AggSCPoint(
             gid,
@@ -1972,7 +1976,8 @@ class BespokeWindPlants(BaseAggregation):
             pre_extract_inclusions=pre_extract_inclusions,
         )
 
-        self._res_fpath = res_fpath
+        self._res_fpath = ([res_fpath]
+                           if isinstance(res_fpath, str) else res_fpath)
         self._obj_fun = objective_function
         self._cap_cost_fun = capital_cost_function
         self._foc_fun = fixed_operating_cost_function
@@ -2123,8 +2128,9 @@ class BespokeWindPlants(BaseAggregation):
                     )
                 )
 
+        hsds = all(check_res_file(fp)[1] for fp in self._res_fpath)
         # just check that this file exists, cannot check res_fpath if *glob
-        with MultiYearWindResource(self._res_fpath) as f:
+        with MultiYearWindResource(self._res_fpath, hsds=hsds) as f:
             assert any(f.dsets)
 
     def _pre_load_data(self, pre_load_data):
@@ -2494,6 +2500,7 @@ class BespokeWindPlants(BaseAggregation):
             "area_filter_kernel": area_filter_kernel,
             "min_area": min_area,
             "h5_handler": MultiYearWindResource,
+            "hsds": all(check_res_file(fp)[1] for fp in res_fpath),
         }
 
         with AggFileHandler(excl_fpath, res_fpath, **file_kwargs) as fh:

reV/config/project_points.py

@@ -464,8 +464,10 @@ class ProjectPoints:
         h_var = "wind_turbine_hub_ht"
         if self._h is None:
             if "wind" in self.tech:
-                # wind technology, get a list of h values
-                self._h = [self[site][1][h_var] for site in self.sites]
+                if h_var in self.df.columns:
+                    self._h = self.df[h_var].values.tolist()
+                else:
+                    self._h = [self[site][1][h_var] for site in self.sites]
 
         return self._h
 
@@ -837,7 +839,6 @@ class ProjectPoints:
             logger.error(msg)
             raise ConfigError(msg)
 
-
         unused_configs = set(curtail_configs) - set(df_configs)
         if unused_configs:
             msg = ("One or more curtailment configurations not found in "
@@ -1164,12 +1165,14 @@ class ProjectPoints:
         multi_h5_res, hsds = check_res_file(res_file)
         if multi_h5_res:
             res_cls = MultiFileResourceX
+            res_kwargs = {}
         else:
             res_cls = ResourceX
+            res_kwargs = {"hsds": hsds}
 
         logger.info("Extracting ProjectPoints for desired regions")
         points = []
-        with res_cls(res_file, hsds=hsds) as f:
+        with res_cls(res_file, **res_kwargs) as f:
             meta = f.meta
             for region, region_col in regions.items():
                 logger.debug("- {}: {}".format(region_col, region))
@@ -1181,7 +1184,7 @@ class ProjectPoints:
                     if duplicates:
                         msg = (
                             "reV Cannot currently handle duplicate "
-                            "Resource gids! The given regions containg the "
+                            "Resource gids! The given regions containing the "
                             "same gids:\n{}".format(duplicates)
                         )
                         logger.error(msg)

reV/supply_curve/aggregation.py

@@ -9,6 +9,7 @@ import h5py
 import numpy as np
 import pandas as pd
 from rex.resource import Resource
+from rex.utilities import check_res_file
 from rex.utilities.execution import SpawnProcessPool
 from rex.utilities.loggers import log_mem
 
@@ -113,6 +114,7 @@ class AggFileHandler(AbstractAggFileHandler):
         area_filter_kernel="queen",
         min_area=None,
         h5_handler=None,
+        **h5_handler_kwargs,
     ):
         """
         Parameters
@@ -136,6 +138,8 @@ class AggFileHandler(AbstractAggFileHandler):
         h5_handler : rex.Resource | None
             Optional special handler similar to the rex.Resource handler which
             is default.
+        **h5_handler_kwargs
+            Optional keyword-value pairs to pass to the h5 handler.
         """
         super().__init__(
             excl_fpath,
@@ -145,9 +149,9 @@ class AggFileHandler(AbstractAggFileHandler):
         )
 
         if h5_handler is None:
-            self._h5 = Resource(h5_fpath)
+            self._h5 = Resource(h5_fpath, **h5_handler_kwargs)
         else:
-            self._h5 = h5_handler(h5_fpath)
+            self._h5 = h5_handler(h5_fpath, **h5_handler_kwargs)
 
     @property
     def h5(self):
@@ -504,8 +508,9 @@ class BaseAggregation(ABC):
             generation run.
         """
 
+        __, hsds = check_res_file(gen_fpath)
         if gen_fpath.endswith(".h5"):
-            with Resource(gen_fpath) as f:
+            with Resource(gen_fpath, hsds=hsds) as f:
                 gen_index = f.meta
         elif gen_fpath.endswith(".csv"):
             gen_index = pd.read_csv(gen_fpath)
@@ -631,7 +636,8 @@ class Aggregation(BaseAggregation):
                 )
             )
 
-        if not os.path.exists(h5_fpath):
+        __, hsds = check_res_file(h5_fpath)
+        if not hsds and not os.path.exists(h5_fpath):
             raise FileNotFoundError(
                 "Could not find required h5 file: " "{}".format(h5_fpath)
             )
@@ -645,7 +651,7 @@ class Aggregation(BaseAggregation):
                     )
                 )
 
-        with Resource(h5_fpath) as f:
+        with Resource(h5_fpath, hsds=hsds) as f:
             for dset in self._agg_dsets:
                 if dset not in f:
                     raise FileInputError(
@@ -744,6 +750,7 @@ class Aggregation(BaseAggregation):
             "excl_dict": excl_dict,
             "area_filter_kernel": area_filter_kernel,
             "min_area": min_area,
+            "hsds": check_res_file(h5_fpath)[1],
         }
         dsets = (
             *agg_dset,
@@ -1011,7 +1018,9 @@ class Aggregation(BaseAggregation):
         chunks = {}
         dtypes = {}
         time_index = None
-        with Resource(h5_fpath) as f:
+
+        __, hsds = check_res_file(h5_fpath)
+        with Resource(h5_fpath, hsds=hsds) as f:
             for dset, data in agg_out.items():
                 dsets.append(dset)
                 shape = data.shape

reV/supply_curve/cli_sc_aggregation.py

@@ -6,6 +6,7 @@ import os
 import logging
 
 from rex.multi_file_resource import MultiFileResource
+from rex.utilities.utilities import check_res_file
 from gaps.cli import as_click_command, CLICommandFromClass
 
 from reV.supply_curve.sc_aggregation import SupplyCurveAggregation
@@ -32,7 +33,7 @@ def _preprocessor(config, out_dir):
     dict
         Updated config file.
     """
-    config = _format_res_fpath(config)
+    config = _validate_res_fpath(config)
     _validate_tm(config)
 
     key_to_modules = {"gen_fpath": [ModuleName.MULTI_YEAR,
@@ -47,32 +48,37 @@ def _preprocessor(config, out_dir):
     return config
 
 
-def _format_res_fpath(config):
-    """Format res_fpath with year, if need be. """
+def _validate_res_fpath(config):
+    """Format res_fpath with year (if needed) and check for file existence"""
     res_fpath = config.setdefault("res_fpath", None)
-    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
+    if not isinstance(res_fpath, str):
+        return config
+
+    if '{}' in res_fpath:
+        config["res_fpath"] = _get_filepath_with_year(res_fpath)
+    else:
+        check_res_file(res_fpath)
 
     return config
 
 
+def _get_filepath_with_year(res_fpath):
+    """Find first file that exists on disk with year filled in"""
+
+    for year in range(1950, 2100):
+        fp = res_fpath.format(year)
+        try:
+            check_res_file(fp)
+        except FileNotFoundError:
+            continue
+        return fp
+
+    msg = ("Could not find any files that match the pattern"
+           "{!r}".format(res_fpath.format("<year>")))
+    logger.error(msg)
+    raise FileNotFoundError(msg)
+
+
 def _validate_tm(config):
     """Check that tm_dset exists or that res_fpath is given (to generate tm)"""
     paths = config["excl_fpath"]

reV/supply_curve/cli_tech_mapping.py

@@ -9,7 +9,7 @@ from gaps.cli import as_click_command, CLICommandFromClass
 from reV.supply_curve.tech_mapping import TechMapping
 from reV.utilities import ModuleName
 from reV.utilities.exceptions import ConfigError
-from reV.supply_curve.cli_sc_aggregation import _format_res_fpath
+from reV.supply_curve.cli_sc_aggregation import _validate_res_fpath
 
 logger = logging.getLogger(__name__)
 
@@ -28,7 +28,7 @@ def _preprocessor(config):
         Updated config file.
     """
     _validate_excl_fpath(config)
-    config = _format_res_fpath(config)
+    config = _validate_res_fpath(config)
     _validate_dset(config)
 
     return config

reV/supply_curve/points.py

@@ -11,7 +11,7 @@ import numpy as np
 import pandas as pd
 from rex.multi_time_resource import MultiTimeResource
 from rex.resource import BaseResource, Resource
-from rex.utilities.utilities import jsonify_dict
+from rex.utilities.utilities import jsonify_dict, check_res_file
 
 from reV.econ.economies_of_scale import EconomiesOfScale
 from reV.econ.utilities import lcoe_fcr
@@ -1169,9 +1169,11 @@ class AggregationSupplyCurvePoint(SupplyCurvePoint):
             Resource h5 handler object.
         """
         if self._h5 is None and "*" in self._h5_fpath:
-            self._h5 = MultiTimeResource(self._h5_fpath)
+            __, hsds = check_res_file(self._h5_fpath)
+            self._h5 = MultiTimeResource(self._h5_fpath, hsds=hsds)
         elif self._h5 is None:
-            self._h5 = Resource(self._h5_fpath)
+            __, hsds = check_res_file(self._h5_fpath)
+            self._h5 = Resource(self._h5_fpath, hsds=hsds)
 
         return self._h5
 
@@ -1643,7 +1645,8 @@ class GenerationSupplyCurvePoint(AggregationSupplyCurvePoint):
             reV generation Resource object
         """
         if self._gen is None:
-            self._gen = Resource(self._gen_fpath, str_decode=False)
+            __, hsds = check_res_file(self._gen_fpath)
+            self._gen = Resource(self._gen_fpath, str_decode=False, hsds=hsds)
 
         return self._gen
 

reV/supply_curve/sc_aggregation.py

@@ -569,15 +569,20 @@ class SupplyCurveAggregation(BaseAggregation):
             generation HDF5 output, or if `recalc_lcoe` is set to
             ``False``, the mean LCOE will be computed from the data
             stored under the `lcoe_dset` instead. By default, ``True``.
-        zones_dset: str, optional
-            Dataset name in `excl_fpath` containing the zones to be applied.
-            If specified, supply curve aggregation will be performed separately
-            for each discrete zone within each supply curve site. This option
-            can be used for uses cases such as subdividing sites by parcel,
-            such that each parcel within each site is output to a separate
-            sc_gid. The input data layer should consist of unique integer
-            values for each zone. Values of zero will be treated as excluded
-            areas.
+        zones_dset : str, optional
+            Dataset name in `excl_fpath` containing the zones to be
+            applied. If specified, supply curve aggregation will be
+            performed separately for each discrete zone within each
+            supply curve site. This option can be used for uses cases
+            such as subdividing sites by parcel, such that each parcel
+            within each site is output to a separate ``sc_gid``. The
+            input data layer should consist of unique integer values for
+            each zone. Values of zero will be treated as excluded areas.
+            This functionality works best of you have on the order of
+            ~100,000 zones or less. If you have significantly more zones
+            than that, the supply curve aggregation computation may take
+            too long to run; consider performing an alternative
+            analysis. By default, ``None``.
 
         Examples
         --------

reV/supply_curve/tech_mapping.py

@@ -16,10 +16,10 @@ from warnings import warn
 
 import h5py
 import numpy as np
+from scipy.spatial import cKDTree
 from rex.resource import Resource
 from rex.utilities.execution import SpawnProcessPool
-from rex.utilities.utilities import res_dist_threshold
-from scipy.spatial import cKDTree
+from rex.utilities.utilities import check_res_file, res_dist_threshold
 
 from reV.supply_curve.extent import SupplyCurveExtent, LATITUDE, LONGITUDE
 from reV.utilities.exceptions import FileInputError, FileInputWarning
@@ -30,17 +30,13 @@ logger = logging.getLogger(__name__)
 class TechMapping:
     """Framework to create map between tech layer (exclusions), res, and gen"""
 
-    def __init__(
-        self, excl_fpath, res_fpath, sc_resolution=1200, dist_margin=1.05
-    ):
+    def __init__(self, excl_fpath, sc_resolution=1200):
         """
         Parameters
         ----------
         excl_fpath : str
             Filepath to exclusions h5 file, must contain latitude and longitude
             arrays to allow for mapping to resource points
-        res_fpath : str
-            Filepath to .h5 resource file that we're mapping to.
         sc_resolution : int | None, optional
             Defines how many exclusion pixels are mapped at a time. Units
             indicate the length of one dimension, in pixels, of each square
@@ -52,22 +48,13 @@ class TechMapping:
             ``sc_resolution`` parameter works in other functionality within
             ``reV``.
 
-        dist_margin : float, optional
-            Extra margin to multiply times the computed distance between
-            neighboring resource points, by default 1.05
         """
         self._excl_fpath = excl_fpath
-        self._res_fpath = res_fpath
         self._check_fout()
 
-        self._tree, self._dist_thresh = self._build_tree(
-            self._res_fpath, dist_margin=dist_margin
-        )
-
         with SupplyCurveExtent(
             self._excl_fpath, resolution=sc_resolution
         ) as sc:
-            self._sc_resolution = sc.resolution
             self._gids = np.array(list(range(len(sc))), dtype=np.uint32)
             self._excl_shape = sc.exclusions.shape
             self._n_excl = np.prod(self._excl_shape)
@@ -82,19 +69,6 @@ class TechMapping:
                 )
             )
 
-    @property
-    def distance_threshold(self):
-        """Get the upper bound on NN distance between excl and res points.
-
-        Returns
-        -------
-        float
-            Estimate the distance between resource points. Calculated as half
-            of the diagonal between closest resource points, with desired
-            extra margin
-        """
-        return self._dist_thresh
-
     @staticmethod
     def _build_tree(res_fpath, dist_margin=1.05):
         """
@@ -118,7 +92,8 @@ class TechMapping:
             of the diagonal between closest resource points, with desired
             extra margin
         """
-        with Resource(res_fpath) as f:
+        __, hsds = check_res_file(res_fpath)
+        with Resource(res_fpath, hsds=hsds) as f:
             lat_lons = f.lat_lon
 
         # pylint: disable=not-callable
@@ -320,12 +295,6 @@ class TechMapping:
                     fillvalue=-1
                 )
 
-            if self._dist_thresh:
-                f[dset].attrs["distance_threshold"] = self._dist_thresh
-
-            if self._res_fpath:
-                f[dset].attrs["src_res_fpath"] = self._res_fpath
-
     def _check_fout(self):
         """Check the TechMapping output file for cached data."""
         with h5py.File(self._excl_fpath, 'r') as f:
@@ -337,9 +306,8 @@ class TechMapping:
                 logger.exception(emsg)
                 raise FileInputError(emsg)
 
-    def map_resource(
-        self, dset, max_workers=None, batch_size=100
-    ):
+    def map_resource(self, dset, res_fpath, dist_margin=1.05,
+                     max_workers=None, batch_size=100):
         """
         Map all resource gids to exclusion gids. Save results to dset in
         exclusions h5 file.
@@ -349,6 +317,11 @@ class TechMapping:
         dset : str, optional
             Name of the output dataset in the exclusions H5 file to which the
             tech map will be saved.
+        res_fpath : str
+            Filepath to .h5 resource file that we're mapping to.
+        dist_margin : float, optional
+            Extra margin to multiply times the computed distance between
+            neighboring resource points, by default 1.05
         max_workers : int, optional
             Number of cores to run mapping on. None uses all available cpus,
             by default None
@@ -362,6 +335,17 @@ class TechMapping:
         """
         loggers = [__name__, "reV"]
 
+        logger.info(
+            f"Computing cKDtree for tech mapping using {res_fpath=!r} "
+            f"and {dist_margin=!r}"
+        )
+        tree, dist_thresh = self._build_tree(
+            res_fpath, dist_margin=dist_margin
+        )
+        with h5py.File(self._excl_fpath, "a") as f:
+            f[dset].attrs["distance_threshold"] = dist_thresh
+            f[dset].attrs["src_res_fpath"] = res_fpath
+
         n_jobs = len(self._gids)
         n_batches = ceil(n_jobs / batch_size)
         gid_batches = np.array_split(self._gids, n_batches)
@@ -389,8 +373,8 @@ class TechMapping:
                         exe.submit(
                             self.map_resource_gids,
                             excl_coords,
-                            self._tree,
-                            self.distance_threshold,
+                            tree,
+                            dist_thresh,
                         )
                     ] = i
 
@@ -476,11 +460,12 @@ class TechMapping:
             out-of-memory errors. Values less than the number of workers can
             also lead to slower processing, due to poor load balancing.
         """
-        kwargs = {"dist_margin": dist_margin, "sc_resolution": sc_resolution}
-        mapper = cls(excl_fpath, res_fpath, **kwargs)
+        mapper = cls(excl_fpath, sc_resolution=sc_resolution)
         mapper.initialize_dataset(dset)
         mapper.map_resource(
-            max_workers=max_workers,
             dset=dset,
+            res_fpath=res_fpath,
+            dist_margin=dist_margin,
+            max_workers=max_workers,
             batch_size=batch_size,
         )

reV/version.py

@@ -2,4 +2,4 @@
 reV Version number
 """
 
-__version__ = "0.14.0"
+__version__ = "0.14.2"