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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NREL-reV
-Version: 0.9.4
+Version: 0.9.6
 Summary: National Renewable Energy Laboratory's (NREL's) Renewable Energy Potential(V) Model: reV
 Home-page: https://nrel.github.io/reV/
 Author: Galen Maclaurin

{NREL_reV-0.9.4.dist-info → NREL_reV-0.9.6.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=yGiTX3S7R3_KR7tg1ywY2A7vCKmVDUNzRXtyt803-Ds,50
-reV/SAM/SAM.py,sha256=wdrL7EAbn6246_3NP6EIksLM2yIg4IKK4taaTA7oj5o,32130
+reV/version.py,sha256=KF4QzcLGqzm27juljTNM1yxsem90POzBTRbnNXt30no,50
+reV/SAM/SAM.py,sha256=1xuxs2gb1wsgbBkhj3mdQVDuSWbp5T5Bh7kLRl69pkg,32258
 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=WYFXb39v7gJp1xxyLtsMLrP8Ze9dB15cxqxRoeNdZyk,89144
+reV/SAM/generation.py,sha256=vUM2DUHCsKh_FBzuUKtFsq_oUXxm47c-oP33KvfA7Ow,86524
 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=vvCyCaJc333yifTqQvGb-nV7OPen3fhpUE6vecelU78,111283
+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
@@ -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=4U-9nMVeKs03jIKdyeLq5FM9uQqAuYcgheAyMyWa5tg,30825
+reV/handlers/multi_year.py,sha256=nLskop2crDnRfd0DwnFw6SZZBqgiJbf9BABtr7u4j7w,30789
 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
@@ -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.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.6.dist-info/LICENSE,sha256=hDwoTANtan2ZpufBlXm5C3W_PJ-mCqItvlcobgjxL7k,1526
+NREL_reV-0.9.6.dist-info/METADATA,sha256=TQcTyDvHLg4eaG9P931K6OUt0nAVQaEqYv8rM6yJHjY,10279
+NREL_reV-0.9.6.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+NREL_reV-0.9.6.dist-info/entry_points.txt,sha256=KGtPEOQRZMSqKXjjv5jt_T4e4HQN0fHiaGdAWwTtuW4,617
+NREL_reV-0.9.6.dist-info/top_level.txt,sha256=S6YF2ZYgXUB6n28SY0K2H8YB9tMJdXQ9CyQbo6VC89M,4
+NREL_reV-0.9.6.dist-info/RECORD,,

reV/SAM/SAM.py

@@ -927,6 +927,9 @@ class RevPySam(Sam):
 
 def _add_cost_defaults(sam_inputs):
     """Add default values for required cost outputs if they are missing. """
+    if sam_inputs.get("__already_added_cost_defaults"):
+        return
+
     sam_inputs.setdefault("fixed_charge_rate", None)
 
     reg_mult = sam_inputs.setdefault("capital_cost_multiplier", 1)
@@ -943,6 +946,8 @@ def _add_cost_defaults(sam_inputs):
     else:
         sam_inputs["capital_cost"] = None
 
+    sam_inputs["__already_added_cost_defaults"] = True
+
 
 def _add_sys_capacity(sam_inputs):
     """Add system capacity SAM input if it is missing. """

reV/SAM/generation.py

@@ -1546,23 +1546,6 @@ class Geothermal(AbstractSamGenerationFromWeatherFile):
         - ``conversion_type`` : Integer flag representing the conversion
           plant type. Either Binary (0) or Flash (1). Only values of 0
           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:
-
-              - The design temperature is larger than the resource
-                temperature
-              - The design temperature is lower than the resource
-                temperature by a factor of ``MAX_RT_TO_EGS_RATIO``
-
-          If either of these conditions are true, the ``design_temp`` is
-          adjusted to match the resource temperature input in order to
-          avoid SAM errors.
-        - ``set_EGS_PDT_to_RT`` : Boolean flag to set EGS design
-          temperature to match the resource temperature input. If this
-          is ``True``, the ``design_temp`` input is ignored. This helps
-          avoid SAM/GETEM errors when the plant design temperature is
-          too high/low compared to the resource temperature.
         - ``geotherm.cost.inj_prod_well_ratio`` : Fraction representing
           the injection to production well ratio (0-1). SAM GUI defaults
           to 0.5 for this value, but it is recommended to set this to
@@ -1632,10 +1615,6 @@ class Geothermal(AbstractSamGenerationFromWeatherFile):
 
     """
 
-    # Per Matt Prilliman on 2/22/24, it's unclear where this ratio originates,
-    # but SAM errors out if it's exceeded.
-    MAX_RT_TO_EGS_RATIO = 1.134324
-    """Max value of ``resource_temperature``/``EGS_plan_design_temperature``"""
     MODULE = "geothermal"
     PYSAM = PySamGeothermal
     PYSAM_WEATHER_TAG = "file_name"
@@ -1738,52 +1717,14 @@ class Geothermal(AbstractSamGenerationFromWeatherFile):
         self.sam_sys_inputs["resource_temp"] = val
 
     def _set_egs_plant_design_temperature(self):
-        """Set the EGS plant temp to match resource, if necessary"""
+        """Set the EGS plant temp to match resource (avoids cf > 1)"""
         if self.sam_sys_inputs.get("resource_type") != 1:
             return  # Not EGS run
 
-        set_egs_pdt_to_rt = self.sam_sys_inputs.get("set_EGS_PDT_to_RT", False)
-        egs_plant_design_temp = self.sam_sys_inputs.get("design_temp", 0)
         resource_temp = self.sam_sys_inputs["resource_temp"]
-
-        if set_egs_pdt_to_rt:
-            msg = (
-                "Setting EGS plant design temperature ({}C) to match "
-                "resource temperature ({}C)".format(
-                    egs_plant_design_temp, resource_temp
-                )
-            )
-            logger.info(msg)
-            self.sam_sys_inputs["design_temp"] = resource_temp
-            return
-
-        if egs_plant_design_temp > resource_temp:
-            msg = (
-                "EGS plant design temperature ({}C) exceeds resource "
-                "temperature ({}C). Lowering EGS plant design temperature "
-                "to match resource temperature".format(
-                    egs_plant_design_temp, resource_temp
-                )
-            )
-            logger.warning(msg)
-            warn(msg)
-            self.sam_sys_inputs["design_temp"] = resource_temp
-            return
-
-        if resource_temp / egs_plant_design_temp > self.MAX_RT_TO_EGS_RATIO:
-            msg = (
-                "EGS plant design temperature ({}C) is lower than resource "
-                "temperature ({}C) by more than a factor of {}. Increasing "
-                "EGS plant design temperature to match resource "
-                "temperature".format(
-                    egs_plant_design_temp,
-                    resource_temp,
-                    self.MAX_RT_TO_EGS_RATIO,
-                )
-            )
-            logger.warning(msg)
-            warn(msg)
-            self.sam_sys_inputs["design_temp"] = resource_temp
+        logger.debug("Setting EGS plant design temperature to match "
+                     "resource temperature ({}C)".format(resource_temp))
+        self.sam_sys_inputs["design_temp"] = resource_temp
 
     def _set_nameplate_to_match_resource_potential(self, resource):
         """Set the nameplate capacity to match the resource potential."""

reV/bespoke/bespoke.py

@@ -54,7 +54,8 @@ class BespokeMultiPlantData:
     reads to a single HDF5 file.
     """
 
-    def __init__(self, res_fpath, sc_gid_to_hh, sc_gid_to_res_gid):
+    def __init__(self, res_fpath, sc_gid_to_hh, sc_gid_to_res_gid,
+                 pre_load_humidity=False):
         """Initialize BespokeMultiPlantData
 
         Parameters
@@ -75,6 +76,9 @@ class BespokeMultiPlantData:
             GID values. Resource GID values should correspond to GID
             values in the HDF5 file, so any GID map must be applied
             before initializing :class`BespokeMultiPlantData`.
+        pre_load_humidity : optional, default=False
+            Option to pre-load relative humidity data (useful for icing
+            runs). If ``False``, relative humidities are not loaded.
         """
         self.res_fpath = res_fpath
         self.sc_gid_to_hh = sc_gid_to_hh
@@ -84,6 +88,8 @@ class BespokeMultiPlantData:
         self._wind_speeds = None
         self._temps = None
         self._pressures = None
+        self._relative_humidities = None
+        self._pre_load_humidity = pre_load_humidity
         self._time_index = None
         self._pre_load_data()
 
@@ -117,6 +123,11 @@ class BespokeMultiPlantData:
                 for hh, gids in self.hh_to_res_gids.items()
             }
             self._time_index = res.time_index
+            if self._pre_load_humidity:
+                self._relative_humidities = {
+                    hh: res["relativehumidity_2m", :, gids]
+                    for hh, gids in self.hh_to_res_gids.items()
+                }
 
         logger.debug(
             f"Data took {(time.time() - start_time) / 60:.2f} " f"min to load"
@@ -139,6 +150,9 @@ class BespokeMultiPlantData:
         hh = self.sc_gid_to_hh[sc_gid]
         sc_point_res_gids = sorted(self.sc_gid_to_res_gid[sc_gid])
         data_inds = np.searchsorted(self.hh_to_res_gids[hh], sc_point_res_gids)
+
+        rh = (None if not self._pre_load_humidity
+              else self._relative_humidities[hh][:, data_inds])
         return BespokeSinglePlantData(
             sc_point_res_gids,
             self._wind_dirs[hh][:, data_inds],
@@ -146,6 +160,7 @@ class BespokeMultiPlantData:
             self._temps[hh][:, data_inds],
             self._pressures[hh][:, data_inds],
             self._time_index,
+            rh,
         )
 
 
@@ -158,7 +173,8 @@ class BespokeSinglePlantData:
     """
 
     def __init__(
-        self, data_inds, wind_dirs, wind_speeds, temps, pressures, time_index
+        self, data_inds, wind_dirs, wind_speeds, temps, pressures, time_index,
+        relative_humidities=None,
     ):
         """Initialize BespokeSinglePlantData
 
@@ -169,22 +185,41 @@ class BespokeSinglePlantData:
             the second dimension of `wind_dirs`, `wind_speeds`, `temps`,
             and `pressures`. The GID value of data_inds[0] should
             correspond to the `wind_dirs[:, 0]` data, etc.
-        wind_dirs, wind_speeds, temps, pressures : 2D np.array
-            Array of wind directions, wind speeds, temperatures, and
+        wind_dirs : 2D np.array
+            Array of wind directions. Dimensions should be correspond to
+            [time, location]. See documentation for `data_inds` for
+            required spatial mapping of GID values.
+        wind_speeds : 2D np.array
+            Array of wind speeds. Dimensions should be correspond to
+            [time, location]. See documentation for `data_inds` for
+            required spatial mapping of GID values.
+        temps : 2D np.array
+            Array oftemperatures. Dimensions should be correspond to
+            [time, location]. See documentation for `data_inds` for
+            required spatial mapping of GID values.
+        pressures : 2D np.array
+            Array of pressures. Dimensions should be correspond to
             pressures, respectively. Dimensions should be correspond to
             [time, location]. See documentation for `data_inds` for
             required spatial mapping of GID values.
         time_index : 1D np.array
             Time index array corresponding to the temporal dimension of
             the 2D data. Will be exposed directly to user.
-
+        relative_humidities : 2D np.array, optional
+            Array of relative humidities. Dimensions should be
+            correspond to [time, location]. See documentation for
+            `data_inds` for required spatial mapping of GID values.
+            If ``None``, relative_humidities cannot be queried.
         """
+
         self.data_inds = data_inds
         self.wind_dirs = wind_dirs
         self.wind_speeds = wind_speeds
         self.temps = temps
         self.pressures = pressures
         self.time_index = time_index
+        self.relative_humidities = relative_humidities
+        self._humidities_exist = relative_humidities is not None
 
     def __getitem__(self, key):
         dset_name, t_idx, gids = key
@@ -197,6 +232,8 @@ class BespokeSinglePlantData:
             return self.temps[t_idx, data_inds]
         if "pressure" in dset_name:
             return self.pressures[t_idx, data_inds]
+        if self._humidities_exist and "relativehumidity" in dset_name:
+            return self.relative_humidities[t_idx, data_inds]
         msg = f"Unknown dataset name: {dset_name!r}"
         logger.error(msg)
         raise ValueError(msg)
@@ -711,6 +748,7 @@ class BespokeSinglePlant:
             weights[i] = self.sc_point.include_mask_flat[mask].sum()
 
         weights /= weights.sum()
+        data = data.astype(np.float32)
         data *= weights
         data = np.sum(data, axis=1)
 
@@ -896,15 +934,18 @@ class BespokeSinglePlant:
             if np.nanmax(pres) > 1000:
                 pres *= 9.86923e-6
 
-            self._res_df = pd.DataFrame(
-                {
-                    "temperature": temp,
-                    "pressure": pres,
-                    "windspeed": ws,
-                    "winddirection": wd,
-                },
-                index=ti,
-            )
+            data = {
+                "temperature": temp,
+                "pressure": pres,
+                "windspeed": ws,
+                "winddirection": wd,
+            }
+
+            if self.sam_sys_inputs.get("en_icing_cutoff"):
+                rh = self.get_weighted_res_ts("relativehumidity_2m")
+                data["relativehumidity"] = rh
+
+            self._res_df = pd.DataFrame(data, index=ti)
 
             if "time_index_step" in self.original_sam_sys_inputs:
                 ti_step = self.original_sam_sys_inputs["time_index_step"]
@@ -1241,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[
@@ -1253,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
             )
 
@@ -2156,7 +2197,10 @@ class BespokeWindPlants(BaseAggregation):
 
         logger.info("Pre-loading resource data for Bespoke run... ")
         self._pre_loaded_data = BespokeMultiPlantData(
-            self._res_fpath, sc_gid_to_hh, sc_gid_to_res_gid
+            self._res_fpath,
+            sc_gid_to_hh,
+            sc_gid_to_res_gid,
+            pre_load_humidity=self._project_points.sam_config_obj.icing,
         )
 
     def _hh_for_sc_gid(self, sc_gid):

reV/handlers/multi_year.py

@@ -96,14 +96,15 @@ class MultiYearGroup:
         pass_through_dsets : list
             List of pass through datasets.
         """
+        with Resource(self.source_files[0]) as res:
+            all_dsets = res.datasets
+
         if isinstance(dsets, str) and dsets == 'PIPELINE':
-            files = parse_previous_status(self._dirout, ModuleName.MULTI_YEAR)
-            with Resource(files[0]) as res:
-                dsets = res.datasets
+            dsets = all_dsets
 
         if "lcoe_fcr" in dsets:
             for dset in LCOE_REQUIRED_OUTPUTS:
-                if dset not in pass_through_dsets and dset in dsets:
+                if dset not in pass_through_dsets and dset in all_dsets:
                     pass_through_dsets.append(dset)
 
         if "dc_ac_ratio" in dsets:

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.4"
+__version__ = "0.9.6"