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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NREL-reV
-Version: 0.9.5
+Version: 0.9.7
 Summary: National Renewable Energy Laboratory's (NREL's) Renewable Energy Potential(V) Model: reV
 Home-page: https://nrel.github.io/reV/
 Author: Galen Maclaurin
@@ -20,7 +20,7 @@ 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.89
+Requires-Dist: NREL-rex>=0.2.97
 Requires-Dist: numpy~=1.24.4
 Requires-Dist: packaging>=20.3
 Requires-Dist: plotly>=4.7.1
@@ -31,6 +31,11 @@ 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: hsds
+Requires-Dist: hsds>=0.8.4; extra == "hsds"
+Provides-Extra: s3
+Requires-Dist: fsspec; extra == "s3"
+Requires-Dist: s3fs; extra == "s3"
 Provides-Extra: test
 Requires-Dist: pytest>=5.2; extra == "test"
 
@@ -151,8 +156,11 @@ Option 1: Install from PIP (recommended for analysts):
 3. Install reV:
     1) ``pip install NREL-reV`` or
 
+       - NOTE: If you install using conda and want to run from files directly on S3 like in the `running reV locally example <https://nrel.github.io/reV/misc/examples.running_locally.html>`_
+         you will also need to install S3 filesystem dependencies: ``pip install NREL-reV[s3]``
+
        - NOTE: If you install using conda and want to use `HSDS <https://github.com/NREL/hsds-examples>`_
-         you will also need to install h5pyd manually: ``pip install h5pyd``
+         you will also need to install HSDS dependencies: ``pip install NREL-reV[hsds]``
 
 Option 2: Clone repo (recommended for developers)
 

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

@@ -1,6 +1,6 @@
 reV/__init__.py,sha256=tXTpWu_qVo3uotfSw_TJ-gNbidGaIPPfUTwBlpCMJ-g,856
 reV/cli.py,sha256=jfGGOr6QlLz8ghA7vBgx5-VgNsy4bBQo5DdHk42-q9A,1601
-reV/version.py,sha256=-d0FHT8TbXm_fBuvfSz3da_dWANi_ww6eK4n0DOIYU0,50
+reV/version.py,sha256=qvsYDmbch162uNYl33wLtWh5TATvNxPNT5ydByLs0dg,50
 reV/SAM/SAM.py,sha256=1xuxs2gb1wsgbBkhj3mdQVDuSWbp5T5Bh7kLRl69pkg,32258
 reV/SAM/__init__.py,sha256=LJqoncyKDY5ZP5WA4kboh561bce11F9Ge645Izah0EY,240
 reV/SAM/defaults.py,sha256=2zqT_mfrVtbvU7Pe6H4anNtiVkIyQbuJcGIOARzEsbM,7193
@@ -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=nWmryaLRFkOwkYLkKUQHgjXqc5YcFGODK4k6VEX0bRU,113473
+reV/bespoke/bespoke.py,sha256=LNPxdu_TK6GrgiGmtQJt0IE6TaAsXv22RYit0daravg,113475
 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
@@ -79,19 +79,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=YEYHpn3KlBbGqpxywrfbrUrlhL3BndgX7cVQerdB6zg,86107
+reV/supply_curve/points.py,sha256=Wk95hMQtsSqjz-rkQrKKoedzI1LWU--_N5KjhPVPRik,86126
 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/__init__.py,sha256=xmF0CVqjZ_KY__MxW_3BGWlWr4MWWRgPk38j4qbn76A,10536
 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.5.dist-info/LICENSE,sha256=hDwoTANtan2ZpufBlXm5C3W_PJ-mCqItvlcobgjxL7k,1526
-NREL_reV-0.9.5.dist-info/METADATA,sha256=hx7F_iukuZl9zoHjAmjElOamOiFwUJPjVa0r2WpFiUY,10279
-NREL_reV-0.9.5.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-NREL_reV-0.9.5.dist-info/entry_points.txt,sha256=KGtPEOQRZMSqKXjjv5jt_T4e4HQN0fHiaGdAWwTtuW4,617
-NREL_reV-0.9.5.dist-info/top_level.txt,sha256=S6YF2ZYgXUB6n28SY0K2H8YB9tMJdXQ9CyQbo6VC89M,4
-NREL_reV-0.9.5.dist-info/RECORD,,
+NREL_reV-0.9.7.dist-info/LICENSE,sha256=hDwoTANtan2ZpufBlXm5C3W_PJ-mCqItvlcobgjxL7k,1526
+NREL_reV-0.9.7.dist-info/METADATA,sha256=zgopP71qLAcbj2YHkfaBvGGZ6oS8xw4e7yUPCLuA5Ho,10735
+NREL_reV-0.9.7.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+NREL_reV-0.9.7.dist-info/entry_points.txt,sha256=KGtPEOQRZMSqKXjjv5jt_T4e4HQN0fHiaGdAWwTtuW4,617
+NREL_reV-0.9.7.dist-info/top_level.txt,sha256=S6YF2ZYgXUB6n28SY0K2H8YB9tMJdXQ9CyQbo6VC89M,4
+NREL_reV-0.9.7.dist-info/RECORD,,

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

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

reV/bespoke/bespoke.py

@@ -1282,7 +1282,7 @@ class BespokeSinglePlant:
         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
+        self._meta[SupplyCurveField.SC_POINT_ANNUAL_ENERGY_MWH] = 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[
@@ -1294,7 +1294,7 @@ class BespokeSinglePlant:
             ]
             self.recalc_lcoe()
         if "annual_energy-means" in self.outputs:
-            self._meta[SupplyCurveField.SC_POINT_ANNUAL_ENERGY_MW] = (
+            self._meta[SupplyCurveField.SC_POINT_ANNUAL_ENERGY_MWH] = (
                 self.outputs["annual_energy-means"] / 1000
             )
 

reV/supply_curve/points.py

@@ -2154,7 +2154,7 @@ class GenerationSupplyCurvePoint(AggregationSupplyCurvePoint):
         return self.exclusion_weighted_mean(self.gen["fixed_charge_rate"])
 
     @property
-    def _sam_system_capacity(self):
+    def _sam_system_capacity_kw(self):
         """float: Mean SAM generation system capacity input, defaults to 0. """
         if self._ssc is not None:
             return self._ssc
@@ -2187,14 +2187,14 @@ 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:
+        if self._sam_system_capacity_kw <= 0:
             return None
 
         if dset not in self.gen.datasets:
             return None
 
         sam_cost = self.exclusion_weighted_mean(self.gen[dset])
-        sam_cost_per_mw = sam_cost / self._sam_system_capacity
+        sam_cost_per_mw = sam_cost / (self._sam_system_capacity_kw / 1000)
         sc_point_cost = sam_cost_per_mw * self.capacity
 
         ac_cap = (self.capacity
@@ -2318,7 +2318,7 @@ class GenerationSupplyCurvePoint(AggregationSupplyCurvePoint):
             SupplyCurveField.CAPACITY_DC_MW: self.capacity_dc,
             SupplyCurveField.EOS_MULT: 1,  # added later
             SupplyCurveField.REG_MULT: self.regional_multiplier,
-            SupplyCurveField.SC_POINT_ANNUAL_ENERGY_MW: (
+            SupplyCurveField.SC_POINT_ANNUAL_ENERGY_MWH: (
                 self.sc_point_annual_energy
             ),
             SupplyCurveField.COST_SITE_OCC_USD_PER_AC_MW: (

reV/utilities/__init__.py

@@ -148,7 +148,7 @@ class SupplyCurveField(FieldEnum):
     RAW_LCOE = "lcoe_raw_usd_per_mwh"
     EOS_MULT = "multiplier_cc_eos"
     REG_MULT = "multiplier_cc_regional"
-    SC_POINT_ANNUAL_ENERGY_MW = "annual_energy_site_mwh"
+    SC_POINT_ANNUAL_ENERGY_MWH = "annual_energy_site_mwh"
     COST_BASE_OCC_USD_PER_AC_MW = "cost_base_occ_usd_per_ac_mw"
     COST_SITE_OCC_USD_PER_AC_MW = "cost_site_occ_usd_per_ac_mw"
     COST_BASE_FOC_USD_PER_AC_MW = "cost_base_foc_usd_per_ac_mw"
@@ -248,7 +248,7 @@ class _LegacySCAliases(Enum):
     N_PARALLEL_TRANS = "n_parallel_trans"
     EOS_MULT = "eos_mult", "capital_cost_multiplier"
     REG_MULT = "reg_mult"
-    SC_POINT_ANNUAL_ENERGY_MW = "sc_point_annual_energy"
+    SC_POINT_ANNUAL_ENERGY_MWH = "sc_point_annual_energy"
     POI_LAT = "poi_lat"
     POI_LON = "poi_lon"
     REINFORCEMENT_POI_LAT = "reinforcement_poi_lat"

reV/version.py

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