Skip to content

Commit

Permalink
end of fy default updates
Browse files Browse the repository at this point in the history
  • Loading branch information
adfarth committed Sep 27, 2023
1 parent 049e8c5 commit 6f273d9
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 27 deletions.
16 changes: 8 additions & 8 deletions src/core/energy_storage/electric_storage.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions src/core/financial.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
12 changes: 6 additions & 6 deletions src/core/generator.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/core/pv.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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 = latitude0 ? 180 : 0, # set azimuth to zero for southern hemisphere
Expand Down

0 comments on commit 6f273d9

Please sign in to comment.