Merge pull request #53 from NREL/develop

bug fix URDB fixed charges

Author: NLaws

CHANGELOG.md

@@ -1,5 +1,10 @@
 # REopt Changelog
 
+## v0.15.2
+- bug fix for 15 & 30 minute electric, heating, and cooling loads
+- bug fix for URDB fixed charges
+- bug fix for default `Wind` `installed_cost_per_kw` and `federal_itc_pct`
+
 ## v0.15.1
 - add `AbsorptionChiller` technology
 - add `ElectricStorage.minimum_avg_soc_fraction` input and constraint

Project.toml

@@ -1,7 +1,7 @@
 name = "REopt"
 uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6"
 authors = ["Nick Laws <nick.laws@nrel.gov>"]
-version = "0.15.1"
+version = "0.15.2"
 
 [deps]
 ArchGDAL = "c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3"

src/core/reopt_inputs.jl

@@ -468,7 +468,7 @@ function setup_gen_inputs(s::AbstractScenario, max_sizes, min_sizes, existing_si
     cap_cost_slope, om_cost_per_kw, production_factor, techs_by_exportbin,
     segmented_techs, n_segs_by_tech, seg_min_size, seg_max_size, seg_yint, techs_no_curtail
     )
-    max_sizes["Generator"] = s.generator.max_kw
+    max_sizes["Generator"] = s.generator.existing_kw + s.generator.max_kw
     min_sizes["Generator"] = s.generator.existing_kw + s.generator.min_kw
     existing_sizes["Generator"] = s.generator.existing_kw
     update_cost_curve!(s.generator, "Generator", s.financial,

src/core/urdb.jl

@@ -525,25 +525,30 @@ function parse_urdb_fixed_charges(d::Dict)
     min_monthly = 0.0
 
     # first try $/month, then check if $/day exists, as of 1/28/2020 there were only $/day and $month entries in the URDB
-    if get(d, "fixedchargeunits", "") == "\$/month" 
-        fixed_monthly = Float64(get(d, "fixedchargefirstmeter", 0.0))
-    end
-    if get(d, "fixedchargeunits", "") == "\$/day"
-        fixed_monthly = Float64(get(d, "fixedchargefirstmeter", 0.0) * 30.4375)
-        # scalar intended to approximate annual charges over 12 month period, derived from 365.25/12
+    fixed_monthly = Float64(get(d, "fixedmonthlycharge", 0.0))
+    if fixed_monthly == 0.0
+        if get(d, "fixedchargeunits", "") == "\$/month" 
+            fixed_monthly = Float64(get(d, "fixedchargefirstmeter", 0.0))
+        elseif get(d, "fixedchargeunits", "") == "\$/day"
+            fixed_monthly = Float64(get(d, "fixedchargefirstmeter", 0.0) * 30.4375)
+            # scalar intended to approximate annual charges over 12 month period, derived from 365.25/12
+        elseif get(d, "fixedchargeunits", "") == "\$/year"
+            fixed_monthly = Float64(get(d, "fixedchargefirstmeter", 0.0) / 12)
+        elseif !isnothing(get(d, "fixedchargefirstmeter",  nothing))
+            @warn "A valid value for fixedchargeunits (\$/month, \$/day, or \$/year) was not provided in urdb_response so the value provided for fixedchargefirstmeter will be ignored."
+        end
     end
 
     if get(d, "minchargeunits", "") == "\$/month"
         min_monthly = Float64(get(d, "mincharge", 0.0))
         # first try $/month, then check if $/day or $/year exists, as of 1/28/2020 these were the only unit types in the urdb
-    end
-    if get(d, "minchargeunits", "") == "\$/day"
+    elseif get(d, "minchargeunits", "") == "\$/day"
         min_monthly = Float64(get(d, "mincharge", 0.0) * 30.4375 )
         # scalar intended to approximate annual charges over 12 month period, derived from 365.25/12
-    end
-
-    if get(d, "minchargeunits", "") == "\$/year"
+    elseif get(d, "minchargeunits", "") == "\$/year"
         annual_min = Float64(get(d, "mincharge", 0.0))
+    elseif !isnothing(get(d, "minchargeunits",  nothing))
+        @warn "A valid value for minchargeunits (\$/month, \$/day, or \$/year) was not provided in urdb_response so the value provided for mincharge will be ignored."
     end
 
     return fixed_monthly, annual_min, min_monthly

src/core/wind.jl

@@ -35,7 +35,7 @@ struct with inner constructor:
 function Wind(;
     min_kw = 0.0,
     max_kw = 1.0e9,
-    installed_cost_per_kw = 0.0,
+    installed_cost_per_kw = missing,
     om_cost_per_kw = 35.0,
     prod_factor_series = missing,
     size_class = "",
@@ -46,7 +46,7 @@ function Wind(;
     macrs_option_years = 5,
     macrs_bonus_pct = 0.0,
     macrs_itc_reduction = 0.5,
-    federal_itc_pct = 0.26,
+    federal_itc_pct = missing,
     federal_rebate_per_kw = 0.0,
     state_ibi_pct = 0.0,
     state_ibi_max = 1.0e10,
@@ -68,7 +68,7 @@ function Wind(;
 
 `size_class` must be one of ["residential", "commercial", "medium", "large"]. If `size_class` is not provided then it is determined based on the average electric load.
 
-If no `installed_cost_per_kw` is provided (or it is 0.0) then it is determined from:
+If no `installed_cost_per_kw` is provided then it is determined from:
 ```julia
 size_class_to_installed_cost = Dict(
     "residential"=> 11950.0,
@@ -101,7 +101,7 @@ These values are passed to SAM to get the turbine production factor.
 struct Wind <: AbstractTech
     min_kw::Float64
     max_kw::Float64
-    installed_cost_per_kw::Float64
+    installed_cost_per_kw::Union{Missing, Float64}
     om_cost_per_kw::Float64
     prod_factor_series::Union{Missing, Array{Real,1}}
     size_class::String
@@ -113,7 +113,7 @@ struct Wind <: AbstractTech
     macrs_option_years::Int
     macrs_bonus_pct::Float64
     macrs_itc_reduction::Float64
-    federal_itc_pct::Float64
+    federal_itc_pct::Union{Missing, Float64}
     federal_rebate_per_kw::Float64
     state_ibi_pct::Float64
     state_ibi_max::Float64
@@ -135,7 +135,7 @@ struct Wind <: AbstractTech
     function Wind(;
         min_kw = 0.0,
         max_kw = 1.0e9,
-        installed_cost_per_kw = 0.0,
+        installed_cost_per_kw = missing,
         om_cost_per_kw = 35.0,
         prod_factor_series = missing,
         size_class = "",
@@ -146,7 +146,7 @@ struct Wind <: AbstractTech
         macrs_option_years = 5,
         macrs_bonus_pct = 0.0,
         macrs_itc_reduction = 0.5,
-        federal_itc_pct = 0.26,
+        federal_itc_pct = missing,
         federal_rebate_per_kw = 0.0,
         state_ibi_pct = 0.0,
         state_ibi_max = 1.0e10,
@@ -200,11 +200,11 @@ struct Wind <: AbstractTech
             @error "Wind.size_class must be one of $(keys(size_class_to_hub_height))"
         end
 
-        if installed_cost_per_kw == 0.0
+        if ismissing(installed_cost_per_kw)
             installed_cost_per_kw = size_class_to_installed_cost[size_class]
         end
 
-        if federal_itc_pct == 0.3
+        if ismissing(federal_itc_pct)
             federal_itc_pct = size_class_to_itc_incentives[size_class]
         end
 

test/runtests.jl

@@ -138,7 +138,7 @@ else  # run HiGHS tests
             "output_flag" => false, "log_to_console" => false)
         )
         results = run_reopt(model, "./scenarios/incentives.json")
-        @test results["Financial"]["lcc"] ≈ 1.094596365e7 atol=1e4  
+        @test results["Financial"]["lcc"] ≈ 1.096852612e7 atol=1e4  
     end
 
     @testset "Fifteen minute load" begin