Skip to content

Commit dfb644b

Browse files
authored
Merge pull request #1169 from NREL-Sienna/gks/move_costs_to_is
Move `ValueCurve`s, cost aliases, `CostCurve`, `FuelCurve`, and associated tests from PSY to IS (PSY version)
2 parents 62a7ad4 + 243ed63 commit dfb644b

File tree

5 files changed

+27
-937
lines changed

5 files changed

+27
-937
lines changed

src/PowerSystems.jl

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,27 @@ import InfrastructureSystems:
589589
get_raw_data_type,
590590
supports_time_series,
591591
supports_supplemental_attributes
592+
import InfrastructureSystems:
593+
ValueCurve,
594+
InputOutputCurve,
595+
IncrementalCurve,
596+
AverageRateCurve,
597+
LinearCurve,
598+
QuadraticCurve,
599+
PiecewisePointCurve,
600+
PiecewiseIncrementalCurve,
601+
PiecewiseAverageCurve,
602+
get_function_data,
603+
get_initial_input,
604+
get_input_at_zero,
605+
get_average_rates,
606+
ProductionVariableCostCurve,
607+
CostCurve,
608+
FuelCurve,
609+
get_value_curve,
610+
get_vom_cost,
611+
get_power_units,
612+
get_fuel_cost
592613

593614
const IS = InfrastructureSystems
594615

@@ -645,9 +666,6 @@ include("models/dynamic_inverter_components.jl")
645666
include("models/OuterControl.jl")
646667

647668
# Costs
648-
include("models/cost_functions/ValueCurves.jl")
649-
include("models/cost_functions/cost_aliases.jl")
650-
include("models/cost_functions/variable_cost.jl")
651669
include("models/cost_functions/operational_cost.jl")
652670
include("models/cost_functions/MarketBidCost.jl")
653671
include("models/cost_functions/HydroGenerationCost.jl")

src/models/cost_functions/ValueCurves.jl

Lines changed: 0 additions & 287 deletions
This file was deleted.

0 commit comments

Comments
 (0)