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

{nrel_rev-0.12.2.dist-info → nrel_rev-0.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: NREL-reV
-Version: 0.12.2
+Version: 0.13.0
 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>
@@ -15,18 +15,20 @@ Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: NREL-gaps<0.8,>=0.7.0
-Requires-Dist: NREL-NRWAL<1,>=0.0.7
-Requires-Dist: NREL-PySAM<7,~=6.0.1
-Requires-Dist: NREL-rex<0.3,>=0.2.99
-Requires-Dist: numpy~=1.24.4
-Requires-Dist: packaging<25,>=20.3
-Requires-Dist: plotly<6,>=4.7.1
-Requires-Dist: plotting<0.0.8,>=0.0.6
-Requires-Dist: shapely<2
+Requires-Dist: NREL-gaps<0.9,>=0.8.0
+Requires-Dist: NREL-NRWAL<0.1,>=0.0.11
+Requires-Dist: NREL-PySAM~=6.0.1
+Requires-Dist: NREL-rex<0.4,>=0.3.1
+Requires-Dist: numpy<3,>=2.0.2
+Requires-Dist: packaging<25,>=24.2
+Requires-Dist: plotly<7,>=6.0.1
+Requires-Dist: plotting<0.1,>=0.0.7
+Requires-Dist: shapely<3,>=2.0.7
 Provides-Extra: test
 Requires-Dist: pytest<9,>=8.3.3; extra == "test"
 Provides-Extra: dev
@@ -146,7 +148,7 @@ as your package/environment manager.
 Option 1: Install from PIP (recommended for analysts):
 
 1. Create a new environment:
-    ``conda create --name rev python=3.9``
+    ``conda create --name rev python=3.11``
 
 2. Activate directory:
     ``conda activate rev``

{nrel_rev-0.12.2.dist-info → nrel_rev-0.13.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-nrel_rev-0.12.2.dist-info/licenses/LICENSE,sha256=hDwoTANtan2ZpufBlXm5C3W_PJ-mCqItvlcobgjxL7k,1526
+nrel_rev-0.13.0.dist-info/licenses/LICENSE,sha256=hDwoTANtan2ZpufBlXm5C3W_PJ-mCqItvlcobgjxL7k,1526
 reV/__init__.py,sha256=tXTpWu_qVo3uotfSw_TJ-gNbidGaIPPfUTwBlpCMJ-g,856
 reV/cli.py,sha256=jfGGOr6QlLz8ghA7vBgx5-VgNsy4bBQo5DdHk42-q9A,1601
-reV/version.py,sha256=zfErvyRqxhvVqUlNnaIzFqGx8VY8fEvhVf5NB_ieQNI,51
+reV/version.py,sha256=hIUvlRrRzHirY4NJU-6xMqe2V_yRaRSnk6a9V3HAi6s,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
@@ -16,11 +16,11 @@ 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=uWuYkWYiI5N50AM4yoAoLwd5CT4CE3sgBJjL_PROnmM,112503
+reV/bespoke/bespoke.py,sha256=2konhn_hV0YXd_h2cbBYbGPUb9oafKY0SvQhBzmOMBE,112661
 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
-reV/bespoke/place_turbines.py,sha256=3l8EUfXd2aeTGjHP8OlllgmaCW_I9gKJIQ9EGlWni_Y,25412
+reV/bespoke/place_turbines.py,sha256=NfAs0OMaXPmwHnz9sTAtntWjvwGwSE8SCQ8fGlGzNoQ,25543
 reV/config/__init__.py,sha256=oqFNU4JESU_fPxFmPyQNFAXLDAdzmTlPuabXTe3Rf2Y,92
 reV/config/base_analysis_config.py,sha256=NvA3g5zQz8mIrV8ZSENLq0XBZGXa6RTGkwpZ76TVZj8,5615
 reV/config/base_config.py,sha256=a748VQ3CRs9RVi5sSEPcaWOyH6R3t5tssaFqZntHyaE,10075
@@ -72,7 +72,7 @@ reV/qa_qc/qa_qc.py,sha256=2ah8Oiz0vOVrezQgGRIHdB-YD34r2mUdzt3f7KyQpxo,17044
 reV/qa_qc/summary.py,sha256=QzfQ0Fd1-Une56XZiGZ8YMl3ir25XNYMyfm-PMB4dZo,31279
 reV/rep_profiles/__init__.py,sha256=v6YZk7tGLpw5gnSckjOn22xazTnv10siCFfWQl9H_fQ,114
 reV/rep_profiles/cli_rep_profiles.py,sha256=i3fRolT7HTzTQePXpNLDyxwgpRa7FEfHO1mOqiSufK4,4613
-reV/rep_profiles/rep_profiles.py,sha256=oqmtU9FbUlKurkglmZLyDBNH8VRKv8fgdSuvtYWLm04,48271
+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
@@ -80,19 +80,19 @@ reV/supply_curve/cli_supply_curve.py,sha256=e-XrHQIe4OqWTL6u-TUAyHrw7Alk7vkXQ2Ho
 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=K9f9s0V_mhwvw33M0Zo0NzfVVRmpZuheKJGnejyf648,88473
+reV/supply_curve/points.py,sha256=k_OrtRF4G_BYl4wky-AolCOBgOAktN4_ZCV1LLYyZl8,88549
 reV/supply_curve/sc_aggregation.py,sha256=SokYyLXdjQwgvdmgiWhLSSTssnkX6ZdCSwO0WzC8SYw,63911
-reV/supply_curve/supply_curve.py,sha256=igbloCkvYQwaH4zjbrYO17J7TtCTX5dKkk-TnlGJJeY,69931
-reV/supply_curve/tech_mapping.py,sha256=nfqPIj9o1pllX3aRC1Hi2KGXYJOYy68Vbvr_1asNmFk,18573
+reV/supply_curve/supply_curve.py,sha256=9zhAA_9XSxE18j1Z9FuC71Wr3I0VuakfR5mt1_gHYuU,69931
+reV/supply_curve/tech_mapping.py,sha256=rsCyv6YBIbHwCXOrYdaVbuKjphi24QsjaWA7F8m8KCY,18567
 reV/utilities/__init__.py,sha256=Z77DeuW_HtMFr7ssywUEgOLikWkDTtbaEdEWiSxwO4Y,10592
 reV/utilities/_clean_readme.py,sha256=IFI9wGPX5nnLTNVLJzH8IOHq9unQlAlHRu4Namib0LA,709
 reV/utilities/cli_functions.py,sha256=1_T_sXz0Ct8lW-vOk3mMRcpD6NYsc9cGI7dEujIi9z4,3864
 reV/utilities/curtailment.py,sha256=As902-2aLGnCiVEutYfAFIOwuV--_rCQhxGNOY9RB-4,5241
 reV/utilities/exceptions.py,sha256=f7sRGsbFLpmL6Caq_H1cD4GfVhnLMyvYUsLPA1UVDDE,3974
-reV/utilities/pytest_utils.py,sha256=T22NFEGxPOc9wRwgy0Pt2cHvw3Vam9cKwUj4AkzI7bU,3244
+reV/utilities/pytest_utils.py,sha256=spCw9yQ8KEYOkQZpCi9IEmaWIvIqHqbUPDXXNQJJ68U,3241
 reV/utilities/slots.py,sha256=xsw-JuUVZ0YeoCNuwP_HxGNxFMA4xRs1tuImXHIJqaU,2618
-nrel_rev-0.12.2.dist-info/METADATA,sha256=1x4NB6NRj-AhydnW05KvJ4NHKGABHxzJStt_Fji8Bh8,10911
-nrel_rev-0.12.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-nrel_rev-0.12.2.dist-info/entry_points.txt,sha256=4IfJtZm2iMJwrbC8J0Or7VjZWnFpvCaHYVpvSWfIwDA,616
-nrel_rev-0.12.2.dist-info/top_level.txt,sha256=S6YF2ZYgXUB6n28SY0K2H8YB9tMJdXQ9CyQbo6VC89M,4
-nrel_rev-0.12.2.dist-info/RECORD,,
+nrel_rev-0.13.0.dist-info/METADATA,sha256=XfYD0aNmttfLYLma2YZm9fCFZDaOVaTvVtAywz-xB3g,11021
+nrel_rev-0.13.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+nrel_rev-0.13.0.dist-info/entry_points.txt,sha256=4IfJtZm2iMJwrbC8J0Or7VjZWnFpvCaHYVpvSWfIwDA,616
+nrel_rev-0.13.0.dist-info/top_level.txt,sha256=S6YF2ZYgXUB6n28SY0K2H8YB9tMJdXQ9CyQbo6VC89M,4
+nrel_rev-0.13.0.dist-info/RECORD,,

reV/bespoke/bespoke.py

@@ -280,8 +280,8 @@ class BespokeSinglePlant:
             Variables available are:
 
                 - ``n_turbines``: the number of turbines
-                - ``system_capacity``: wind plant capacity
-                - ``aep``: annual energy production
+                - ``system_capacity``: wind plant capacity (kW)
+                - ``aep``: annual energy production (kWh)
                 - ``avg_sl_dist_to_center_m``: Average straight-line
                   distance to the supply curve point center from all
                   turbine locations (in m). Useful for computing plant
@@ -290,20 +290,22 @@ class BespokeSinglePlant:
                   distance to the medoid of all turbine locations
                   (in m). Useful for computing plant BOS costs.
                 - ``nn_conn_dist_m``: Total BOS connection distance
-                  using nearest-neighbor connections. This variable is
-                  only available for the
+                  using nearest-neighbor connections (in m). This
+                  variable is only available for the
                   ``balance_of_system_cost_function`` equation.
                 - ``fixed_charge_rate``: user input fixed_charge_rate if
                   included as part of the sam system config.
-                - ``capital_cost``: plant capital cost as evaluated
+                - ``capital_cost``: plant capital cost ($) as evaluated
                   by `capital_cost_function`
                 - ``fixed_operating_cost``: plant fixed annual operating
-                  cost as evaluated by `fixed_operating_cost_function`
+                  cost ($/year) as evaluated by
+                  `fixed_operating_cost_function`
                 - ``variable_operating_cost``: plant variable annual
-                  operating cost as evaluated by
+                  operating cost ($/kWh) as evaluated by
                   `variable_operating_cost_function`
                 - ``balance_of_system_cost``: plant balance of system
-                  cost as evaluated by `balance_of_system_cost_function`
+                  cost ($) as evaluated by
+                  `balance_of_system_cost_function`
                 - ``self.wind_plant``: the SAM wind plant object,
                   through which all SAM variables can be accessed
 
@@ -1567,8 +1569,8 @@ class BespokeWindPlants(BaseAggregation):
             for computation are:
 
                 - ``n_turbines``: the number of turbines
-                - ``system_capacity``: wind plant capacity
-                - ``aep``: annual energy production
+                - ``system_capacity``: wind plant capacity (kW)
+                - ``aep``: annual energy production (kWh)
                 - ``avg_sl_dist_to_center_m``: Average straight-line
                   distance to the supply curve point center from all
                   turbine locations (in m). Useful for computing plant
@@ -1577,20 +1579,22 @@ class BespokeWindPlants(BaseAggregation):
                   distance to the medoid of all turbine locations
                   (in m). Useful for computing plant BOS costs.
                 - ``nn_conn_dist_m``: Total BOS connection distance
-                  using nearest-neighbor connections. This variable is
-                  only available for the
+                  using nearest-neighbor connections (in m). This
+                  variable is only available for the
                   ``balance_of_system_cost_function`` equation.
                 - ``fixed_charge_rate``: user input fixed_charge_rate if
                   included as part of the sam system config.
-                - ``capital_cost``: plant capital cost as evaluated
+                - ``capital_cost``: plant capital cost ($) as evaluated
                   by `capital_cost_function`
                 - ``fixed_operating_cost``: plant fixed annual operating
-                  cost as evaluated by `fixed_operating_cost_function`
+                  cost ($/year) as evaluated by
+                  `fixed_operating_cost_function`
                 - ``variable_operating_cost``: plant variable annual
-                  operating cost as evaluated by
+                  operating cost ($/kWh) as evaluated by
                   `variable_operating_cost_function`
                 - ``balance_of_system_cost``: plant balance of system
-                  cost as evaluated by `balance_of_system_cost_function`
+                  cost ($) as evaluated by
+                  `balance_of_system_cost_function`
                 - ``self.wind_plant``: the SAM wind plant object,
                   through which all SAM variables can be accessed
 

reV/bespoke/place_turbines.py

@@ -3,6 +3,8 @@
 """
 place turbines for bespoke wind plants
 """
+from functools import wraps
+
 import numpy as np
 from shapely.geometry import MultiPoint, MultiPolygon, Point, Polygon
 
@@ -31,11 +33,13 @@ def none_until_optimized(func):
         optimized.
     """
 
+    @wraps(func)
     def _func(pt):
         """Wrapper to return `None` if `PlaceTurbines` is not optimized"""
         if pt.optimized_design_variables is None:
-            return
+            return None
         return func(pt)
+
     return _func
 
 
@@ -64,8 +68,8 @@ class PlaceTurbines:
             optimization. Variables available are:
 
                 - ``n_turbines``: the number of turbines
-                - ``system_capacity``: wind plant capacity
-                - ``aep``: annual energy production
+                - ``system_capacity``: wind plant capacity (kW)
+                - ``aep``: annual energy production (kWh)
                 - ``avg_sl_dist_to_center_m``: Average straight-line
                   distance to the supply curve point center from all
                   turbine locations (in m). Useful for computing plant
@@ -74,20 +78,22 @@ class PlaceTurbines:
                   distance to the medoid of all turbine locations
                   (in m). Useful for computing plant BOS costs.
                 - ``nn_conn_dist_m``: Total BOS connection distance
-                  using nearest-neighbor connections. This variable is
-                  only available for the
+                  using nearest-neighbor connections (in m). This
+                  variable is only available for the
                   ``balance_of_system_cost_function`` equation.
                 - ``fixed_charge_rate``: user input fixed_charge_rate if
                   included as part of the sam system config.
-                - ``capital_cost``: plant capital cost as evaluated
+                - ``capital_cost``: plant capital cost ($) as evaluated
                   by `capital_cost_function`
                 - ``fixed_operating_cost``: plant fixed annual operating
-                  cost as evaluated by `fixed_operating_cost_function`
+                  cost ($/year) as evaluated by
+                  `fixed_operating_cost_function`
                 - ``variable_operating_cost``: plant variable annual
-                  operating cost as evaluated by
+                  operating cost ($/kWh) as evaluated by
                   `variable_operating_cost_function`
                 - ``balance_of_system_cost``: plant balance of system
-                  cost as evaluated by `balance_of_system_cost_function`
+                  cost ($) as evaluated by
+                  `balance_of_system_cost_function`
                 - ``self.wind_plant``: the SAM wind plant object,
                   through which all SAM variables can be accessed
 

reV/rep_profiles/rep_profiles.py

@@ -111,7 +111,7 @@ class RepresentativeMethods:
         i : int
             Location of the Nth min value in arr.
         """
-        return arr.argsort()[: (n + 1)][-1]
+        return int(arr.argsort()[: (n + 1)][-1])
 
     @staticmethod
     def meanoid(profiles, weights=None):
@@ -384,8 +384,8 @@ class RegionRepProfile:
             }
         )
         df = df.sort_values(self.RES_GID_COL)
-        self._gen_gids = df[self.GEN_GID_COL].values
-        self._res_gids = df[self.RES_GID_COL].values
+        self._gen_gids = df[self.GEN_GID_COL].to_list()
+        self._res_gids = df[self.RES_GID_COL].to_list()
         if self._weight is not None:
             self._weights = df["weights"].values
         else:
@@ -395,7 +395,7 @@ class RegionRepProfile:
             meta = res.meta
 
             assert ResourceMetaField.GID in meta
-            source_res_gids = meta[ResourceMetaField.GID].values
+            source_res_gids = meta[ResourceMetaField.GID].to_list()
             msg = ('Resource gids from "gid" column in meta data from "{}" '
                    'must be sorted! reV generation should always be run with '
                    'sequential project points.'.format(self._gen_fpath))
@@ -503,7 +503,7 @@ class RegionRepProfile:
             n_profiles=self._n_profiles,
         )
 
-    @ property
+    @property
     def rep_profiles(self):
         """Get the representative profiles of this region."""
         if self._profiles is None:
@@ -511,7 +511,7 @@ class RegionRepProfile:
 
         return self._profiles
 
-    @ property
+    @property
     def i_reps(self):
         """Get the representative profile index(es) of this region."""
         if self._i_reps is None:
@@ -519,7 +519,7 @@ class RegionRepProfile:
 
         return self._i_reps
 
-    @ property
+    @property
     def rep_gen_gids(self):
         """Get the representative profile gen gids of this region."""
         gids = self._gen_gids
@@ -530,7 +530,7 @@ class RegionRepProfile:
 
         return rep_gids
 
-    @ property
+    @property
     def rep_res_gids(self):
         """Get the representative profile resource gids of this region."""
         gids = self._res_gids
@@ -541,7 +541,7 @@ class RegionRepProfile:
 
         return rep_gids
 
-    @ classmethod
+    @classmethod
     def get_region_rep_profile(cls, gen_fpath, rev_summary,
                                cf_dset='cf_profile',
                                rep_method='meanoid',
@@ -677,7 +677,7 @@ class RepProfilesBase(ABC):
         self._rep_method = rep_method
         self._err_method = err_method
 
-    @ staticmethod
+    @staticmethod
     def _parse_rev_summary(rev_summary):
         """Extract, parse, and check the rev summary table.
 
@@ -714,7 +714,7 @@ class RepProfilesBase(ABC):
 
         return rev_summary
 
-    @ staticmethod
+    @staticmethod
     def _check_req_cols(df, cols):
         """Check a dataframe for required columns.
 
@@ -738,7 +738,7 @@ class RepProfilesBase(ABC):
                 logger.error(e)
                 raise KeyError(e)
 
-    @ staticmethod
+    @staticmethod
     def _check_rev_gen(gen_fpath, cf_dset, rev_summary):
         """Check rev gen file for requisite datasets.
 
@@ -791,7 +791,7 @@ class RepProfilesBase(ABC):
             for k in range(self._n_profiles)
         }
 
-    @ property
+    @property
     def time_index(self):
         """Get the time index for the rep profiles.
 
@@ -811,7 +811,7 @@ class RepProfilesBase(ABC):
 
         return self._time_index
 
-    @ property
+    @property
     def meta(self):
         """Meta data for the representative profiles.
 
@@ -823,7 +823,7 @@ class RepProfilesBase(ABC):
         """
         return self._meta
 
-    @ property
+    @property
     def profiles(self):
         """Get the arrays of representative CF profiles corresponding to meta.
 
@@ -934,15 +934,15 @@ class RepProfilesBase(ABC):
         )
         self._write_h5_out(fout, save_rev_summary=save_rev_summary)
 
-    @ abstractmethod
+    @abstractmethod
     def _run_serial(self):
         """Abstract method for serial run method."""
 
-    @ abstractmethod
+    @abstractmethod
     def _run_parallel(self):
         """Abstract method for parallel run method."""
 
-    @ abstractmethod
+    @abstractmethod
     def run(self):
         """Abstract method for generic run method."""
 

reV/supply_curve/points.py

@@ -56,13 +56,13 @@ class AbstractSupplyCurvePoint(ABC):
         self._parse_slices(resolution, exclusion_shape)
 
     @staticmethod
-    def _ordered_unique(seq):
+    def _ordered_unique_from_np(seq):
         """Get a list of unique values in the same order as the input sequence.
 
         Parameters
         ----------
-        seq : list | tuple
-            Sequence of values.
+        seq : np.array
+            Numpy array containing a sequence of values.
 
         Returns
         -------
@@ -72,7 +72,7 @@ class AbstractSupplyCurvePoint(ABC):
 
         seen = set()
 
-        return [x for x in seq if not (x in seen or seen.add(x))]
+        return [x for x in seq.tolist() if not (x in seen or seen.add(x))]
 
     def _parse_sc_row_col_ind(self, resolution, exclusion_shape):
         """Parse SC row and column index.
@@ -558,7 +558,7 @@ class SupplyCurvePoint(AbstractSupplyCurvePoint):
             List of h5 gids.
         """
         if self._h5_gid_set is None:
-            self._h5_gid_set = self._ordered_unique(self._h5_gids)
+            self._h5_gid_set = self._ordered_unique_from_np(self._h5_gids)
             if -1 in self._h5_gid_set:
                 self._h5_gid_set.remove(-1)
 
@@ -1306,7 +1306,7 @@ class AggregationSupplyCurvePoint(SupplyCurvePoint):
         gid_counts : list
         """
         gid_counts = [
-            self.include_mask_flat[(self._h5_gids == gid)].sum()
+            float(self.include_mask_flat[(self._h5_gids == gid)].sum())
             for gid in self.h5_gid_set
         ]
 
@@ -1657,7 +1657,7 @@ class GenerationSupplyCurvePoint(AggregationSupplyCurvePoint):
             List of resource gids.
         """
         if self._res_gid_set is None:
-            self._res_gid_set = self._ordered_unique(self._res_gids)
+            self._res_gid_set = self._ordered_unique_from_np(self._res_gids)
             if -1 in self._res_gid_set:
                 self._res_gid_set.remove(-1)
 
@@ -1673,7 +1673,7 @@ class GenerationSupplyCurvePoint(AggregationSupplyCurvePoint):
             List of generation gids.
         """
         if self._gen_gid_set is None:
-            self._gen_gid_set = self._ordered_unique(self._gen_gids)
+            self._gen_gid_set = self._ordered_unique_from_np(self._gen_gids)
             if -1 in self._gen_gid_set:
                 self._gen_gid_set.remove(-1)
 
@@ -1702,7 +1702,7 @@ class GenerationSupplyCurvePoint(AggregationSupplyCurvePoint):
             List of exclusion pixels in each resource/generation gid.
         """
         gid_counts = [
-            self.include_mask_flat[(self._res_gids == gid)].sum()
+            float(self.include_mask_flat[(self._res_gids == gid)].sum())
             for gid in self.res_gid_set
         ]
 

reV/supply_curve/supply_curve.py

@@ -507,8 +507,8 @@ class SupplyCurve:
             Table mapping supply curve points to transmission features
             (should already be merged with SC points).
         """
-        sc_gids = set(sc_points[SupplyCurveField.SC_GID].unique())
-        trans_sc_gids = set(trans_table[SupplyCurveField.SC_GID].unique())
+        sc_gids = set(sc_points[SupplyCurveField.SC_GID].tolist())
+        trans_sc_gids = set(trans_table[SupplyCurveField.SC_GID].tolist())
         missing = sorted(list(sc_gids - trans_sc_gids))
         if any(missing):
             msg = (

reV/supply_curve/tech_mapping.py

@@ -62,7 +62,7 @@ class TechMapping:
             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.product(self._excl_shape)
+            self._n_excl = np.prod(self._excl_shape)
             self._sc_row_indices = sc.row_indices
             self._sc_col_indices = sc.col_indices
             self._excl_row_slices = sc.excl_row_slices
@@ -137,7 +137,7 @@ class TechMapping:
         iarr : ndarray
             2D array of 1D index values for the flattened h5 excl extent
         """
-        iarr = np.arange(np.product(shape), dtype=np.uint32)
+        iarr = np.arange(np.prod(shape), dtype=np.uint32)
 
         return iarr.reshape(shape)
 

reV/utilities/pytest_utils.py

@@ -80,7 +80,7 @@ def make_fake_h5_chunks(td, features, shuffle=False):
     lat = np.linspace(90, 0, 50)
     lon = np.linspace(-180, 0, 50)
     lon, lat = np.meshgrid(lon, lat)
-    gids = np.arange(np.product(lat.shape))
+    gids = np.arange(np.prod(lat.shape))
     if shuffle:
         np.random.shuffle(gids)
     gids = gids.reshape(shape[:-1])

reV/version.py

@@ -2,4 +2,4 @@
 reV Version number
 """
 
-__version__ = "0.12.2"
+__version__ = "0.13.0"