NREL-reV 0.9.0__py3-none-any.whl → 0.9.2__py3-none-any.whl

{NREL_reV-0.9.0.dist-info → NREL_reV-0.9.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: NREL-reV
-Version: 0.9.0
+Version: 0.9.2
 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.0.dist-info → NREL_reV-0.9.2.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=1L_LIr61Neb0VTgrPuHWPOXmcvf03SLALTnnaozT9Gs,50
-reV/SAM/SAM.py,sha256=KZ5EmHv2Uhoxh3xSDWYm7RmwMw-M7hfsh7P_qY-Shc8,31628
+reV/version.py,sha256=ZggWF5z5HY0xtKYNitKGKEQSDJ5G21AZQKZMzs5u-wo,50
+reV/SAM/SAM.py,sha256=SUyaWK3InUh90iQqbka-g_X36EfGuwslEfKEPCIpMrw,31691
 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=_kDNC4ZJ_i9TUw8Tt2GdxgGqZ1hUrEe25WPr_SUas0Q,87542
+reV/SAM/generation.py,sha256=D4vkir6uU9QgY_9AMQOXA-4blGcQoxRH0O6PEfgqWok,89142
 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=22WO3APF5Tq20oifmQzrV-08amEyOmLjGZjLHsXezOU,110323
+reV/bespoke/bespoke.py,sha256=DgNPIeCmeqpOSaMbaqmJKQGatoLd8MOPTTQpZBlvzJI,110353
 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
@@ -31,13 +31,13 @@ reV/config/project_points.py,sha256=NmIj7hQm4qSMBqgefZDRNot2B8APCDk0ynTwegk-1Go,
 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
-reV/econ/econ.py,sha256=_sfUhtodY0auz1yROFCFPxUu3GUV_HvwwBo1uzOrnks,22982
-reV/econ/economies_of_scale.py,sha256=Hac0M5_HgYm3HmfAcHIiq0flLAJjVK-wJuyu_DDH5Gs,10634
+reV/econ/econ.py,sha256=edsNPZg2amhC_GZeotkY2MU3u17NgWeCpS6okZNrwAA,23637
+reV/econ/economies_of_scale.py,sha256=GfM0vj4LnwsthzhSsUnmLt78PAUHrxZI5ghWaxvoF7A,10568
 reV/econ/utilities.py,sha256=ZOA49S1jfsvdenvlL7m-BAJIrAvpAHSix5-wrSW0uLc,1232
 reV/generation/__init__.py,sha256=LBecrbpL69tROol_OwVHTKBrTqgSSxJW59fs0k3o0jQ,75
 reV/generation/base.py,sha256=p6g8Bj8T98OfKu44LTocGtEozstbUvti6wSi3oroS5U,48758
 reV/generation/cli_gen.py,sha256=5RSlr8yO9zlB-1FzFZGClqsxqsrbr9rcS_8PlOjVx2s,4435
-reV/generation/generation.py,sha256=WOclf4DzSy4qKpRCy4RUmnh7rkcLBcutH8NmQl9T2CQ,46367
+reV/generation/generation.py,sha256=jtlUcfmQKDcXarRwj-iJBS_60TG-w2TKoowfU_1tBQg,46981
 reV/generation/output_attributes/generation.json,sha256=cy8efVCJgNSYCsR3x3_VpMCtynYS3oaQG4M2MwcdzFY,4954
 reV/generation/output_attributes/lcoe_fcr.json,sha256=d_TGMkZsmsfDXQiWfhYjFkmwqi-wKF8JdHmiMCj2h38,136
 reV/generation/output_attributes/lcoe_fcr_inputs.json,sha256=Yb-WTXt9YD4wE4Uu315W2uLFH6g3fT40YY83mxS-aWE,1289
@@ -79,9 +79,9 @@ 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=0yMaxfvDW-EDMRcEMNKK5r1wdUbboR2iVVqe8DgTT0I,85944
+reV/supply_curve/points.py,sha256=YEYHpn3KlBbGqpxywrfbrUrlhL3BndgX7cVQerdB6zg,86107
 reV/supply_curve/sc_aggregation.py,sha256=6kJg4CaLlFAC196azbfzA-T_wXkXSwNDQKOW-k2lqcE,61645
-reV/supply_curve/supply_curve.py,sha256=i_Wo5cI11hNt5zfGZiqqBNM4_qERD1dVNmud1tWJteI,69942
+reV/supply_curve/supply_curve.py,sha256=igbloCkvYQwaH4zjbrYO17J7TtCTX5dKkk-TnlGJJeY,69931
 reV/supply_curve/tech_mapping.py,sha256=7him2R-8kpigI47ATSN4ncnvzuF_AzeXyrtz_jmzLug,18573
 reV/utilities/__init__.py,sha256=iOvOuqcXv_WaSP627z2i2wF5820DbUSGRa7lSj23diQ,10534
 reV/utilities/cli_functions.py,sha256=1_T_sXz0Ct8lW-vOk3mMRcpD6NYsc9cGI7dEujIi9z4,3864
@@ -89,9 +89,9 @@ reV/utilities/curtailment.py,sha256=fu48Lje-iyd2Awfe-6jFebvgcKSeJ3daNNTqjFI2GvM,
 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.0.dist-info/LICENSE,sha256=hDwoTANtan2ZpufBlXm5C3W_PJ-mCqItvlcobgjxL7k,1526
-NREL_reV-0.9.0.dist-info/METADATA,sha256=hkdHRfdqhgSf-YxHU7lZss4kgeJE5fYVfWWDHpK7FRQ,10294
-NREL_reV-0.9.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-NREL_reV-0.9.0.dist-info/entry_points.txt,sha256=KGtPEOQRZMSqKXjjv5jt_T4e4HQN0fHiaGdAWwTtuW4,617
-NREL_reV-0.9.0.dist-info/top_level.txt,sha256=S6YF2ZYgXUB6n28SY0K2H8YB9tMJdXQ9CyQbo6VC89M,4
-NREL_reV-0.9.0.dist-info/RECORD,,
+NREL_reV-0.9.2.dist-info/LICENSE,sha256=hDwoTANtan2ZpufBlXm5C3W_PJ-mCqItvlcobgjxL7k,1526
+NREL_reV-0.9.2.dist-info/METADATA,sha256=eIecsAhbE1ayna5v0f8gIhfDFYeHN_Mgyjdo_uLEATY,10294
+NREL_reV-0.9.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+NREL_reV-0.9.2.dist-info/entry_points.txt,sha256=KGtPEOQRZMSqKXjjv5jt_T4e4HQN0fHiaGdAWwTtuW4,617
+NREL_reV-0.9.2.dist-info/top_level.txt,sha256=S6YF2ZYgXUB6n28SY0K2H8YB9tMJdXQ9CyQbo6VC89M,4
+NREL_reV-0.9.2.dist-info/RECORD,,

reV/SAM/SAM.py

@@ -950,4 +950,7 @@ def _add_sys_capacity(sam_inputs):
         if cap is not None:
             cap = max(cap)
 
+    if cap is None:
+        cap = sam_inputs.get("nameplate")
+
     sam_inputs["system_capacity"] = cap

reV/SAM/generation.py

@@ -233,6 +233,15 @@ class AbstractSamGeneration(RevPySam, ScheduledLossesMixin, ABC):
             logger.error(msg)
             raise InputError(msg)
 
+        if len(resource) < 8760:
+            msg = (f"Detected resource time series of length {len(resource)}, "
+                   "which is less than 8760. This may yield unexpected "
+                   "results or fail altogether. If this is not intentional, "
+                   "try setting 'time_index_step: 1' in your SAM config or "
+                   "double check the resource input you're using.")
+            logger.warning(msg)
+            warn(msg)
+
     @abstractmethod
     def set_resource_data(self, resource, meta):
         """Placeholder for resource data setting (nsrdb or wtk)"""
@@ -1786,6 +1795,10 @@ class Geothermal(AbstractSamGenerationFromWeatherFile):
                 "{}".format(self.sam_sys_inputs["nameplate"])
             )
             logger.info(msg)
+            # required for downstream LCOE calcs
+            self.sam_sys_inputs["system_capacity"] = (
+                self.sam_sys_inputs["nameplate"]
+            )
             return
 
         val = set(resource["potential_MW"].unique())
@@ -1801,6 +1814,8 @@ class Geothermal(AbstractSamGenerationFromWeatherFile):
 
         logger.debug("Setting the nameplate to {}".format(val))
         self.sam_sys_inputs["nameplate"] = val
+        # required for downstream LCOE calcs
+        self.sam_sys_inputs["system_capacity"] = val
 
     def _set_resource_potential_to_match_gross_output(self):
         """Set the resource potential input to match the gross generation.
@@ -1861,7 +1876,9 @@ class Geothermal(AbstractSamGenerationFromWeatherFile):
             logger.debug(
                 "Setting the capital_cost to ${:,.2f}".format(capital_cost)
             )
-            self.sam_sys_inputs["capital_cost"] = capital_cost
+            reg_mult = self.sam_sys_inputs.get("capital_cost_multiplier", 1)
+            self.sam_sys_inputs["base_capital_cost"] = capital_cost
+            self.sam_sys_inputs["capital_cost"] = capital_cost * reg_mult
 
         dc_per_well = self.sam_sys_inputs.pop("drill_cost_per_well", None)
         num_wells = self.sam_sys_inputs.pop(
@@ -1884,19 +1901,35 @@ class Geothermal(AbstractSamGenerationFromWeatherFile):
                         drill_cost, num_wells, dc_per_well
                     )
                 )
-                self.sam_sys_inputs["capital_cost"] = capital_cost + drill_cost
+                reg_mult = self.sam_sys_inputs.get(
+                    "capital_cost_multiplier", 1
+                )
+                base_cc = capital_cost / reg_mult
+                new_base_cc = base_cc + drill_cost
+                self.sam_sys_inputs["base_capital_cost"] = new_base_cc
+                self.sam_sys_inputs["capital_cost"] = new_base_cc * reg_mult
 
         foc_per_kw = self.sam_sys_inputs.pop(
             "fixed_operating_cost_per_kw", None
         )
         if foc_per_kw is not None:
-            fixed_operating_cost = foc_per_kw * plant_size_kw
+            foc = foc_per_kw * plant_size_kw
             logger.debug(
-                "Setting the fixed_operating_cost to ${:,.2f}".format(
-                    capital_cost
-                )
+                "Setting the fixed_operating_cost to ${:,.2f}".format(foc)
+            )
+            self.sam_sys_inputs["base_fixed_operating_cost"] = foc
+            self.sam_sys_inputs["fixed_operating_cost"] = foc
+
+        voc_per_kw = self.sam_sys_inputs.pop(
+            "variable_operating_cost_per_kw", None
+        )
+        if voc_per_kw is not None:
+            voc = voc_per_kw * plant_size_kw
+            logger.debug(
+                "Setting the variable_operating_cost to ${:,.2f}".format(voc)
             )
-            self.sam_sys_inputs["fixed_operating_cost"] = fixed_operating_cost
+            self.sam_sys_inputs["base_variable_operating_cost"] = voc
+            self.sam_sys_inputs["variable_operating_cost"] = voc
 
     def _create_pysam_wfile(self, resource, meta):
         """Create PySAM weather input file.

reV/bespoke/bespoke.py

@@ -1263,10 +1263,10 @@ class BespokeSinglePlant:
         self._outputs.update(means)
 
         self._meta[SupplyCurveField.MEAN_RES] = self.res_df["windspeed"].mean()
-        self._meta[SupplyCurveField.MEAN_CF_DC] = None
-        self._meta[SupplyCurveField.MEAN_CF_AC] = None
-        self._meta[SupplyCurveField.MEAN_LCOE] = None
-        self._meta[SupplyCurveField.SC_POINT_ANNUAL_ENERGY_MW] = None
+        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
         # 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[
@@ -1373,7 +1373,7 @@ class BespokeSinglePlant:
         # convert SAM system capacity in kW to reV supply curve cap in MW
         capacity_ac_mw = system_capacity_kw / 1e3
         self._meta[SupplyCurveField.CAPACITY_AC_MW] = capacity_ac_mw
-        self._meta[SupplyCurveField.CAPACITY_DC_MW] = None
+        self._meta[SupplyCurveField.CAPACITY_DC_MW] = np.nan
 
         # add required ReEDS multipliers to meta
         baseline_cost = self.plant_optimizer.capital_cost_per_kw(
@@ -1618,7 +1618,7 @@ class BespokeWindPlants(BaseAggregation):
             multiple sites can be specified to evaluate ``reV`` at
             multiple specific locations. A string pointing to a project
             points CSV file may also be specified. Typically, the CSV
-            contains two columns:
+            contains the following columns:
 
                 - ``gid``: Integer specifying the supply curve GID of
                   each site.
@@ -1635,7 +1635,7 @@ class BespokeWindPlants(BaseAggregation):
             site-specific capital cost value for each location). Columns
             that do not correspond to a config key may also be included,
             but they will be ignored. The CSV file input can also have
-            these extra columns:
+            these extra, optional columns:
 
                 - ``capital_cost_multiplier``
                 - ``fixed_operating_cost_multiplier``

reV/econ/econ.py

@@ -76,25 +76,36 @@ class Econ(BaseGen):
             (or slice) representing the GIDs of multiple sites can be
             specified to evaluate reV at multiple specific locations.
             A string pointing to a project points CSV file may also be
-            specified. Typically, the CSV contains two columns:
+            specified. Typically, the CSV contains the following
+            columns:
 
-                - ``gid``: Integer specifying the GID of each site.
+                - ``gid``: Integer specifying the generation GID of each
+                  site.
                 - ``config``: Key in the `sam_files` input dictionary
                   (see below) corresponding to the SAM configuration to
                   use for each particular site. This value can also be
                   ``None`` (or left out completely) if you specify only
                   a single SAM configuration file as the `sam_files`
                   input.
-
-            The CSV file may also contain site-specific inputs by
+                - ``capital_cost_multiplier``: This is an *optional*
+                  multiplier input that, if included, will be used to
+                  regionally scale the ``capital_cost`` input in the SAM
+                  config. If you include this column in your CSV, you
+                  *do not* need to specify ``capital_cost``, unless you
+                  would like that value to vary regionally and
+                  independently of the multiplier (i.e. the multiplier
+                  will still be applied on top of the ``capital_cost``
+                  input).
+
+            The CSV file may also contain other site-specific inputs by
             including a column named after a config keyword (e.g. a
-            column called ``capital_cost`` may be included to specify a
-            site-specific capital cost value for each location). Columns
-            that do not correspond to a config key may also be included,
-            but they will be ignored. A DataFrame following the same
-            guidelines as the CSV input (or a dictionary that can be
-            used to initialize such a DataFrame) may be used for this
-            input as well.
+            column called ``wind_turbine_rotor_diameter`` may be
+            included to specify a site-specific turbine diameter for
+            each location). Columns that do not correspond to a config
+            key may also be included, but they will be ignored. A
+            DataFrame following the same guidelines as the CSV input
+            (or a dictionary that can be used to initialize such a
+            DataFrame) may be used for this input as well.
         sam_files : dict | str
             A dictionary mapping SAM input configuration ID(s) to SAM
             configuration(s). Keys are the SAM config ID(s) which

reV/econ/economies_of_scale.py

@@ -212,11 +212,7 @@ class EconomiesOfScale:
         if cost_per_mw is None:
             return None
 
-        cost = cap * cost_per_mw
-        if cost > 0:
-            return cost
-
-        return None
+        return cap * cost_per_mw
 
     @property
     def raw_capital_cost(self):
@@ -278,7 +274,7 @@ class EconomiesOfScale:
             Fixed operating cost from input data arg
         """
         foc_from_cap = self._cost_from_cap(
-            SupplyCurveField.COST_BASE_FOC_USD_PER_AC_MW
+            SupplyCurveField.COST_SITE_FOC_USD_PER_AC_MW
         )
         if foc_from_cap is not None:
             return foc_from_cap
@@ -297,7 +293,7 @@ class EconomiesOfScale:
             Variable operating cost from input data arg
         """
         voc_from_cap = self._cost_from_cap(
-            SupplyCurveField.COST_BASE_VOC_USD_PER_AC_MW
+            SupplyCurveField.COST_SITE_VOC_USD_PER_AC_MW
         )
         if voc_from_cap is not None:
             return voc_from_cap

reV/generation/generation.py

@@ -171,7 +171,7 @@ class Gen(BaseGen):
             multiple sites can be specified to evaluate reV at multiple
             specific locations. A string pointing to a project points
             CSV file may also be specified. Typically, the CSV contains
-            two columns:
+            the following columns:
 
                 - ``gid``: Integer specifying the generation GID of each
                   site.
@@ -181,16 +181,25 @@ class Gen(BaseGen):
                   ``None`` (or left out completely) if you specify only
                   a single SAM configuration file as the `sam_files`
                   input.
-
-            The CSV file may also contain site-specific inputs by
+                - ``capital_cost_multiplier``: This is an *optional*
+                  multiplier input that, if included, will be used to
+                  regionally scale the ``capital_cost`` input in the SAM
+                  config. If you include this column in your CSV, you
+                  *do not* need to specify ``capital_cost``, unless you
+                  would like that value to vary regionally and
+                  independently of the multiplier (i.e. the multiplier
+                  will still be applied on top of the ``capital_cost``
+                  input).
+
+            The CSV file may also contain other site-specific inputs by
             including a column named after a config keyword (e.g. a
-            column called ``capital_cost`` may be included to specify a
-            site-specific capital cost value for each location). Columns
-            that do not correspond to a config key may also be included,
-            but they will be ignored. A DataFrame following the same
-            guidelines as the CSV input (or a dictionary that can be
-            used to initialize such a DataFrame) may be used for this
-            input as well.
+            column called ``wind_turbine_rotor_diameter`` may be
+            included to specify a site-specific turbine diameter for
+            each location). Columns that do not correspond to a config
+            key may also be included, but they will be ignored. A
+            DataFrame following the same guidelines as the CSV input
+            (or a dictionary that can be used to initialize such a
+            DataFrame) may be used for this input as well.
 
             .. Note:: By default, the generation GID of each site is
               assumed to match the resource GID to be evaluated for that

reV/supply_curve/points.py

@@ -2188,10 +2188,10 @@ 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:
-            return 0
+            return None
 
         if dset not in self.gen.datasets:
-            return 0
+            return None
 
         sam_cost = self.exclusion_weighted_mean(self.gen[dset])
         sam_cost_per_mw = sam_cost / self._sam_system_capacity
@@ -2391,10 +2391,11 @@ class GenerationSupplyCurvePoint(AggregationSupplyCurvePoint):
         summary[SupplyCurveField.RAW_LCOE] = eos.raw_lcoe
         summary[SupplyCurveField.MEAN_LCOE] = eos.scaled_lcoe
         summary[SupplyCurveField.EOS_MULT] = eos.capital_cost_scalar
-        summary[SupplyCurveField.COST_SITE_OCC_USD_PER_AC_MW] = (
-            summary[SupplyCurveField.COST_SITE_OCC_USD_PER_AC_MW]
-            * summary[SupplyCurveField.EOS_MULT]
-        )
+        cost = summary[SupplyCurveField.COST_SITE_OCC_USD_PER_AC_MW]
+        if cost is not None:
+            summary[SupplyCurveField.COST_SITE_OCC_USD_PER_AC_MW] = (
+                cost * summary[SupplyCurveField.EOS_MULT]
+            )
         return summary
 
     @classmethod
@@ -2537,6 +2538,10 @@ class GenerationSupplyCurvePoint(AggregationSupplyCurvePoint):
             if cap_cost_scale is not None:
                 summary = point.economies_of_scale(cap_cost_scale, summary)
 
+        for arg, val in summary.items():
+            if val is None:
+                summary[arg] = np.nan
+
         return summary
 
 

reV/supply_curve/supply_curve.py

@@ -1116,8 +1116,7 @@ class SupplyCurve:
 
         return table
 
-    # pylint: disable=C901
-    def _full_sort(
+    def _full_sort(  # noqa: C901
         self,
         trans_table,
         trans_costs=None,
@@ -1289,7 +1288,7 @@ class SupplyCurve:
 
         for col in _REQUIRED_OUTPUT_COLS:
             if col not in self._trans_table:
-                self._trans_table[col] = None
+                self._trans_table[col] = np.nan
             if col not in columns:
                 columns.append(col)
 

reV/version.py

@@ -2,4 +2,4 @@
 reV Version number
 """
 
-__version__ = "0.9.0"
+__version__ = "0.9.2"