NREL · hdunham · Apr 22, 2024 · Nov 16, 2023 · Nov 16, 2023 · Nov 16, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,14 @@ Classify the change according to the following categories:
     ### Deprecated
     ### Removed
 
+## Develop - 2024-04-05
+### Fixed 
+- Added `export_rate_beyond_net_metering_limit` to list of inputs to be converted to type Real, to avoid MethodError if type is vector of Any. 
+- Fix blended CRB processing when one or more load types have zero annual energy
+- Handle an array of length 1 for CHP.installed_cost_per_kw which fixes the API using this parameter
+### Changed
+- add **ElectricStorage** input option **soc_min_applies_during_outages** (which defaults to _false_) and only apply the minimum state of charge constraint in function `add_MG_storage_dispatch_constraints` if it is _true_
+
 ## v0.44.0
 ### Added 
 - in `src/settings.jl`, added new const **INDICATOR_COMPATIBLE_SOLVERS**
@@ -712,7 +720,7 @@ Other changes:
 ## v0.3.0
 ### Added
 - add separate decision variables and constraints for microgrid tech capacities
-    - new Site input `mg_tech_sizes_equal_grid_sizes` (boolean), when `false` the microgrid tech capacities are constrained to be <= the grid connected tech capacities
+    - new Site input `mg_tech_sizes_equal_grid_sizes` (boolean), when _false_ the microgrid tech capacities are constrained to be <= the grid connected tech capacities
 ### Fixed
 - allow non-integer `outage_probabilities`
 - correct `total_unserved_load` output

diff --git a/src/constraints/outage_constraints.jl b/src/constraints/outage_constraints.jl
@@ -286,10 +286,12 @@ function add_MG_storage_dispatch_constraints(m,p)
         )
     )
 
-    # Minimum state of charge
-    @constraint(m, [s in p.s.electric_utility.scenarios, tz in p.s.electric_utility.outage_start_time_steps, ts in p.s.electric_utility.outage_time_steps],
-        m[:dvMGStoredEnergy][s, tz, ts] >=  p.s.storage.attr["ElectricStorage"].soc_min_fraction * m[:dvStorageEnergy]["ElectricStorage"]
-    )
+    if p.s.storage.attr["ElectricStorage"].soc_min_applies_during_outages
+        # Minimum state of charge
+        @constraint(m, [s in p.s.electric_utility.scenarios, tz in p.s.electric_utility.outage_start_time_steps, ts in p.s.electric_utility.outage_time_steps],
+            m[:dvMGStoredEnergy][s, tz, ts] >=  p.s.storage.attr["ElectricStorage"].soc_min_fraction * m[:dvStorageEnergy]["ElectricStorage"]
+        )
+    end
 
     # Dispatch to MG electrical storage is no greater than inverter capacity
     # and can't charge the battery unless binMGStorageUsed = 1

diff --git a/src/core/chp.jl b/src/core/chp.jl
@@ -181,7 +181,7 @@ function CHP(d::Dict;
         end
     elseif length(chp.installed_cost_per_kw) > 1 && length(chp.installed_cost_per_kw) != length(chp.tech_sizes_for_cost_curve)
         throw(@error("To model CHP cost curve, you must provide `chp.tech_sizes_for_cost_curve` vector of equal length to `chp.installed_cost_per_kw`"))
-    elseif typeof(chp.installed_cost_per_kw) == Vector && length(chp.installed_cost_per_kw) == 1
+    elseif typeof(chp.installed_cost_per_kw) <: Array && length(chp.installed_cost_per_kw) == 1
         chp.installed_cost_per_kw = chp.installed_cost_per_kw[1]
     elseif isempty(chp.tech_sizes_for_cost_curve) && isempty(chp.installed_cost_per_kw)
         update_installed_cost_params = true
@@ -541,4 +541,4 @@ function get_size_class_from_size(chp_elec_size_heuristic_kw, class_bounds, n_cl
         end
     end
     return size_class
-end
+end
diff --git a/src/core/doe_commercial_reference_building_loads.jl b/src/core/doe_commercial_reference_building_loads.jl
@@ -218,7 +218,9 @@ function blend_and_scale_doe_profiles(
             monthly_scaler = length(blended_doe_reference_names)
         end
         for idx in 1:length(profiles)
-            profiles[idx] .*= total_kwh / annual_kwhs[idx] / monthly_scaler
+            if !(annual_kwhs[idx] == 0.0)
+                profiles[idx] .*= total_kwh / annual_kwhs[idx] / monthly_scaler
+            end
         end
     end
     for idx in 1:length(profiles)  # scale the profiles

diff --git a/src/core/energy_storage/electric_storage.jl b/src/core/energy_storage/electric_storage.jl
@@ -144,6 +144,7 @@ end
     inverter_efficiency_fraction::Float64 = 0.96
     rectifier_efficiency_fraction::Float64 = 0.96
     soc_min_fraction::Float64 = 0.2
+    soc_min_applies_during_outages::Bool = false
     soc_init_fraction::Float64 = off_grid_flag ? 1.0 : 0.5
     can_grid_charge::Bool = off_grid_flag ? false : true
     installed_cost_per_kw::Real = 910.0
@@ -176,6 +177,7 @@ Base.@kwdef struct ElectricStorageDefaults
     inverter_efficiency_fraction::Float64 = 0.96
     rectifier_efficiency_fraction::Float64 = 0.96
     soc_min_fraction::Float64 = 0.2
+    soc_min_applies_during_outages::Bool = false
     soc_init_fraction::Float64 = off_grid_flag ? 1.0 : 0.5
     can_grid_charge::Bool = off_grid_flag ? false : true
     installed_cost_per_kw::Real = 910.0
@@ -214,6 +216,7 @@ struct ElectricStorage <: AbstractElectricStorage
     inverter_efficiency_fraction::Float64
     rectifier_efficiency_fraction::Float64
     soc_min_fraction::Float64
+    soc_min_applies_during_outages::Bool
     soc_init_fraction::Float64
     can_grid_charge::Bool
     installed_cost_per_kw::Real
@@ -301,6 +304,7 @@ struct ElectricStorage <: AbstractElectricStorage
             s.inverter_efficiency_fraction,
             s.rectifier_efficiency_fraction,
             s.soc_min_fraction,
+            s.soc_min_applies_during_outages,
             s.soc_init_fraction,
             s.can_grid_charge,
             s.installed_cost_per_kw,

diff --git a/src/core/utils.jl b/src/core/utils.jl
@@ -208,7 +208,7 @@ function dictkeys_tosymbols(d::Dict)
             end
         end
         if k in [
-            "fuel_cost_per_mmbtu", "wholesale_rate",
+            "fuel_cost_per_mmbtu", "wholesale_rate", "export_rate_beyond_net_metering_limit",
             # for ERP
             "generator_size_kw", "generator_operational_availability",
             "generator_failure_to_start", "generator_mean_time_to_failure",

diff --git a/test/scenarios/outage.json b/test/scenarios/outage.json
@@ -56,7 +56,8 @@
         "installed_cost_per_kw": 840.0,
         "installed_cost_per_kwh": 420.0,
         "replace_cost_per_kw": 410.0,
-        "replace_cost_per_kwh": 200.0
+        "replace_cost_per_kwh": 200.0,
+        "soc_min_applies_during_outages": true
     },
     "Financial": {
         "value_of_lost_load_per_kwh": 100.0,

diff --git a/test/scenarios/outages_gen_pv_stor.json b/test/scenarios/outages_gen_pv_stor.json
@@ -43925,6 +43925,7 @@
         "inverter_efficiency_fraction": 0.96,
         "rectifier_efficiency_fraction": 0.96,
         "soc_min_fraction": 0.2,
+        "soc_min_applies_during_outages": true,
         "soc_init_fraction": 0.5,
         "can_grid_charge": false,
         "installed_cost_per_kw": 840.0,

diff --git a/test/scenarios/outages_gen_pv_wind_stor.json b/test/scenarios/outages_gen_pv_wind_stor.json
diff --git a/test/scenarios/wind_outages.json b/test/scenarios/wind_outages.json
@@ -16,7 +16,9 @@
         "max_kw": 5000,
         "size_class": "large"
     },
-    "ElectricStorage": {},    
+    "ElectricStorage": {
+        "soc_min_applies_during_outages": true
+    },    
     "Financial": {
         "value_of_lost_load_per_kwh": 0.0,
         "microgrid_upgrade_cost_fraction": 0.0