diff --git a/src/core/energy_storage/electric_storage.jl b/src/core/energy_storage/electric_storage.jl index b73805df8..2d84bd281 100644 --- a/src/core/energy_storage/electric_storage.jl +++ b/src/core/energy_storage/electric_storage.jl @@ -146,10 +146,10 @@ end soc_min_fraction::Float64 = 0.2 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 = 958.0 - installed_cost_per_kwh::Real = 479.0 - replace_cost_per_kw::Real = 440.0 - replace_cost_per_kwh::Real = 220.0 + installed_cost_per_kw::Real = 910.0 + installed_cost_per_kwh::Real = 455.0 + replace_cost_per_kw::Real = 715.0 + replace_cost_per_kwh::Real = 318.0 inverter_replacement_year::Int = 10 battery_replacement_year::Int = 10 macrs_option_years::Int = 7 @@ -178,10 +178,10 @@ Base.@kwdef struct ElectricStorageDefaults soc_min_fraction::Float64 = 0.2 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 = 958.0 - installed_cost_per_kwh::Real = 479.0 - replace_cost_per_kw::Real = 440.0 - replace_cost_per_kwh::Real = 220.0 + installed_cost_per_kw::Real = 910.0 + installed_cost_per_kwh::Real = 455.0 + replace_cost_per_kw::Real = 715.0 + replace_cost_per_kwh::Real = 318.0 inverter_replacement_year::Int = 10 battery_replacement_year::Int = 10 macrs_option_years::Int = 7 diff --git a/src/core/financial.jl b/src/core/financial.jl index 78a7e45c9..04a67c4fc 100644 --- a/src/core/financial.jl +++ b/src/core/financial.jl @@ -2,16 +2,16 @@ """ `Financial` is an optional REopt input with the following keys and default values: ```julia - om_cost_escalation_rate_fraction::Real = 0.0253, + om_cost_escalation_rate_fraction::Real = 0.025, elec_cost_escalation_rate_fraction::Real = 0.017, - existing_boiler_fuel_cost_escalation_rate_fraction::Float64 = 0.012, - boiler_fuel_cost_escalation_rate_fraction::Real = 0.012, - chp_fuel_cost_escalation_rate_fraction::Real = 0.012, - generator_fuel_cost_escalation_rate_fraction::Real = 0.013, - offtaker_tax_rate_fraction::Real = 0.257, + existing_boiler_fuel_cost_escalation_rate_fraction::Float64 = 0.015, + boiler_fuel_cost_escalation_rate_fraction::Real = 0.015, + chp_fuel_cost_escalation_rate_fraction::Real = 0.015, + generator_fuel_cost_escalation_rate_fraction::Real = 0.012, + offtaker_tax_rate_fraction::Real = 0.26, # combined state and federal tax rate offtaker_discount_rate_fraction::Real = 0.0638, third_party_ownership::Bool = false, - owner_tax_rate_fraction::Real = 0.257, + owner_tax_rate_fraction::Real = 0.26, # combined state and federal tax rate owner_discount_rate_fraction::Real = 0.0638, analysis_years::Int = 25, value_of_lost_load_per_kwh::Union{Array{R,1}, R} where R<:Real = 1.00, #only applies to multiple outage modeling @@ -76,12 +76,12 @@ struct Financial function Financial(; off_grid_flag::Bool = false, - om_cost_escalation_rate_fraction::Real = 0.0253, + om_cost_escalation_rate_fraction::Real = 0.025, elec_cost_escalation_rate_fraction::Real = 0.017, - existing_boiler_fuel_cost_escalation_rate_fraction::Float64 = 0.012, - boiler_fuel_cost_escalation_rate_fraction::Real = 0.012, - chp_fuel_cost_escalation_rate_fraction::Real = 0.012, - generator_fuel_cost_escalation_rate_fraction::Real = 0.013, + existing_boiler_fuel_cost_escalation_rate_fraction::Float64 = 0.015, + boiler_fuel_cost_escalation_rate_fraction::Real = 0.015, + chp_fuel_cost_escalation_rate_fraction::Real = 0.015, + generator_fuel_cost_escalation_rate_fraction::Real = 0.012, offtaker_tax_rate_fraction::Real = 0.257, offtaker_discount_rate_fraction::Real = 0.0638, third_party_ownership::Bool = false, diff --git a/src/core/generator.jl b/src/core/generator.jl index fdf495158..921f421ca 100644 --- a/src/core/generator.jl +++ b/src/core/generator.jl @@ -6,11 +6,11 @@ existing_kw::Real = 0, min_kw::Real = 0, max_kw::Real = 1.0e6, - installed_cost_per_kw::Real = only_runs_during_grid_outage ? 650.0 : 800.0, - om_cost_per_kw::Real = off_grid_flag ? 20.0 : 10.0, + installed_cost_per_kw::Real = off_grid_flag ? 880 : only_runs_during_grid_outage ? 650.0 : 800.0, + om_cost_per_kw::Real = off_grid_flag ? 10.0 : 20.0, om_cost_per_kwh::Real = 0.0, fuel_cost_per_gallon::Real = 3.61, - electric_efficiency_full_load::Real = 0.3233, + electric_efficiency_full_load::Real = 0.322, electric_efficiency_half_load::Real = electric_efficiency_full_load, fuel_avail_gal::Real = 1.0e9, fuel_higher_heating_value_kwh_per_gal::Real = 40.7, @@ -101,11 +101,11 @@ struct Generator <: AbstractGenerator existing_kw::Real = 0, min_kw::Real = 0, max_kw::Real = 1.0e6, - installed_cost_per_kw::Real = only_runs_during_grid_outage ? 650.0 : 800.0, - om_cost_per_kw::Real= off_grid_flag ? 20.0 : 10.0, + installed_cost_per_kw::Real = off_grid_flag ? 880 : only_runs_during_grid_outage ? 650.0 : 800.0, + om_cost_per_kw::Real= off_grid_flag ? 10.0 : 20.0, om_cost_per_kwh::Real = 0.0, fuel_cost_per_gallon::Real = 3.61, - electric_efficiency_full_load::Real = 0.3233, + electric_efficiency_full_load::Real = 0.322, electric_efficiency_half_load::Real = electric_efficiency_full_load, fuel_avail_gal::Real = 1.0e9, fuel_higher_heating_value_kwh_per_gal::Real = KWH_PER_GAL_DIESEL, diff --git a/src/core/pv.jl b/src/core/pv.jl index e3bc034c2..035aa0333 100644 --- a/src/core/pv.jl +++ b/src/core/pv.jl @@ -102,7 +102,7 @@ mutable struct PV <: AbstractTech off_grid_flag::Bool = false, latitude::Real, array_type::Int=1, # PV Watts array type (0: Ground Mount Fixed (Open Rack); 1: Rooftop, Fixed; 2: Ground Mount 1-Axis Tracking; 3 : 1-Axis Backtracking; 4: Ground Mount, 2-Axis Tracking) - tilt::Real= array_type == 1 ? 10 : 25, # tilt = 10 deg for rooftop systems, 25 for ground-mount + tilt::Real= array_type == 1 ? 10 : 20, # tilt = 10 deg for rooftop systems, 20 for ground-mount module_type::Int=0, # PV module type (0: Standard; 1: Premium; 2: Thin Film) losses::Real=0.14, azimuth::Real = latitude≥0 ? 180 : 0, # set azimuth to zero for southern hemisphere