NREL-reV 0.9.5__tar.gz → 0.9.7__tar.gz

{NREL-reV-0.9.5 → NREL-reV-0.9.7/NREL_reV.egg-info}/PKG-INFO

@@ -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
@@ -123,8 +123,11 @@ Description:
         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)
         
@@ -228,3 +231,5 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
 Provides-Extra: test
 Provides-Extra: dev
+Provides-Extra: s3
+Provides-Extra: hsds

{NREL-reV-0.9.5 → NREL-reV-0.9.7}/NREL_reV.egg-info/requires.txt

@@ -1,7 +1,7 @@
 NREL-gaps>=0.6.11
 NREL-NRWAL>=0.0.7
 NREL-PySAM~=4.1.0
-NREL-rex>=0.2.89
+NREL-rex>=0.2.97
 numpy~=1.24.4
 packaging>=20.3
 plotly>=4.7.1
@@ -14,5 +14,12 @@ flake8
 pre-commit
 pylint
 
+[hsds]
+hsds>=0.8.4
+
+[s3]
+fsspec
+s3fs
+
 [test]
 pytest>=5.2

{NREL-reV-0.9.5/NREL_reV.egg-info → NREL-reV-0.9.7}/PKG-INFO

@@ -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
@@ -123,8 +123,11 @@ Description:
         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)
         
@@ -228,3 +231,5 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
 Provides-Extra: test
 Provides-Extra: dev
+Provides-Extra: s3
+Provides-Extra: hsds

{NREL-reV-0.9.5 → NREL-reV-0.9.7}/README.rst

@@ -126,8 +126,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 → NREL-reV-0.9.7}/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
             )
 

{NREL-reV-0.9.5 → NREL-reV-0.9.7}/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: (

{NREL-reV-0.9.5 → NREL-reV-0.9.7}/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"

{NREL-reV-0.9.5 → NREL-reV-0.9.7}/reV/version.py

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

{NREL-reV-0.9.5 → NREL-reV-0.9.7}/setup.py

@@ -106,6 +106,8 @@ setup(
     extras_require={
         "test": test_requires,
         "dev": test_requires + ["flake8", "pre-commit", "pylint"],
+        "s3": ['fsspec', 's3fs'],
+        "hsds": ["hsds>=0.8.4"],
     },
     cmdclass={"develop": PostDevelopCommand},
 )